[mlir][openacc] Add separate acc data operations for OpenACC data clauses

[razvanlupusoru]

Summary

As outlined in [1], data clauses are now implemented as separate operations
from the constructs that they belong to. Some of the highlighted benefits:

• Correctly represent dataflow of data operations
• Easier to track debugging information
• Friendlier to add attributes and to optimize operations

For now, all of the other operand lists are being kept until all references
to them in LLVM can be removed (such as those in flang lowering)

[1] https://discourse.llvm.org/t/rfc-openacc-dialect-data-operation-improvements/69825

[razvanlupusoru]

Added memory effects to recently added acc.kernels and acc.serial.
Added newlines at end of newly added files.

[clementval]

I just did a quick overview and I have some questions and nits.

mlir/include/mlir/Dialect/OpenACC/CMakeLists.txt

27

Add new line here and couple of other files.

mlir/include/mlir/Dialect/OpenACC/OpenACCBase.td

2

Is this change necessary for this patch to work?

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

1

I think the line is too long now.

333

Should this be OpenACC_PointerLikeTypeInterface for the type? Same comment for other dataClauseOperands

mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp

207–208

Unrelated change

[razvanlupusoru]

mlir/include/mlir/Dialect/OpenACC/OpenACCBase.td

2

I need to check this. I include this file in both OpenACCOps.td and OpenACCOpsTypes.td. I would need to check whether the latter works without a dialect definition.

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

1

Will fix.

333

Yes. Nice catch.

mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp

207–208

OK. I will restore this.

[vzakhari]

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

143

It would be useful to describe the order in which bounds are listed. Is it matching the language order?

[clementval]

You probably noticed it but there are couple of failures on the pre-commit ci on the flang side

Flang :: Lower/OpenACC/acc-data-operands.f90
Flang :: Lower/OpenACC/acc-data.f90
Flang :: Lower/OpenACC/acc-enter-data.f90
Flang :: Lower/OpenACC/acc-exit-data.f90
Flang :: Lower/OpenACC/acc-parallel-loop.f90
Flang :: Lower/OpenACC/acc-parallel.f90
Flang :: Lower/OpenACC/acc-serial-loop.f90
Flang :: Lower/OpenACC/acc-serial.f90
Flang :: Lower/OpenACC/locations.f90

[razvanlupusoru]

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

143

Thank you for catching this ambiguity. I added the following wording:
// The bounds are represented in rank order. Rank 0 (innermost dimension) is the first.

Making the bounds match language order would cause ambiguity since we would have to know the dialect (and its source language) that the acc dialect is being paired with.

The choice of representing bounds in rank order with rank-0 being first also matches other dialects like vector dialect:
https://mlir.llvm.org/docs/Dialects/Vector/#alternatives-for-lowering-an-n-d-vector-type-to-llvm
"Consider a vector of rank n with static sizes {s_0, ... s_{n-1}} (i.e. an MLIR vector<s_0x...s_{n-1}xf32>)"

[razvanlupusoru]

mlir/include/mlir/Dialect/OpenACC/OpenACCBase.td

2

I confirm that this change is needed due to the fact that the OpenACCOpsTypes.td file also needs a dialect definition to define a new type:

class OpenACC_Type<string name, string typeMnemonic> : TypeDef<OpenACC_Dialect, name> {

[vzakhari]

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

143

Thank you, Razvan! It looks great!

[clementval]

mlir/include/mlir/Dialect/OpenACC/OpenACCBase.td

2

Ok makes sense.

[clementval]

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

89–99

Shouldn't we switch the naming here. It's DataClase enum but we have CopyinOp and so on. I would rename the enum attr from Op to Clause and the actual operation defined below from Clause to Op.

now

def OpenACC_PresentClause : OpenACC_DataEntryClause<"present",
    "mlir::acc::DataClause::acc_present"> {
  let summary = "Specifies that the variable is already present on device.";
}

after

def OpenACC_PresentOp : OpenACC_DataEntryOp<"present",
    "mlir::acc::DataClause::acc_present"> {
  let summary = "Specifies that the variable is already present on device.";
}

[razvanlupusoru]

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

89–99

Agreed.

[razvanlupusoru]

Addressed reviewer comments including:

• Swapping clause and op naming so that MLIR operations end with Op.
• Clarifying rank ordering for bounds.

[clementval]

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

89–99

Thanks for the update. I think it reads better now.

192

This comment needs an update.

206

This comment needs an update.

277

This comment needs an update.

[razvanlupusoru]

Fixed incorrect comment for acc clause modifier getters.

[clementval]

LGTM

[razvanlupusoru]

Removed MemoryEffects interface from data operations. I had a comment that the current modeling was not ideal since there are host, device, and runtime effects. The effects also differ depending on whether the acc target is a shared memory system (as defined in section 2.6). Since more design is needed for modeling, I just removed them from the data operations.

[clementval]

Still LGTM

[razvanlupusoru]

Fix for buildbot failures after I landed this change:
https://reviews.llvm.org/D148673

[mehdi_amini]

mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp

50

The usual way we have been handling this in-tree has been to use "external interfaces", see for example scf::registerBufferizableOpInterfaceExternalModels() and look into the implementation for registerAllDialects.

That way we keep dialects independents from each others!

[razvanlupusoru]

mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp

50

Sounds like this is what I need to do here. I will investigate this suggestion and follow-up in the coming week. Thank you for your advice.

mlir/include/mlir/Dialect/OpenACC/CMakeLists.txt

 set(LLVM_TARGET_DEFINITIONS ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend/OpenACC/ACC.td)
 mlir_tablegen(AccCommon.td --gen-directive-decl --directives-dialect=OpenACC)
 add_public_tablegen_target(acc_common_td)
 
+add_mlir_dialect(OpenACCOps acc)
+
+add_mlir_doc(OpenACCOps OpenACCDialect Dialects/ -gen-dialect-doc)
+add_dependencies(OpenACCDialectDocGen acc_common_td)
+
 set(LLVM_TARGET_DEFINITIONS OpenACCOps.td)
-mlir_tablegen(OpenACCOpsDialect.h.inc -gen-dialect-decls -dialect=acc)
-mlir_tablegen(OpenACCOpsDialect.cpp.inc -gen-dialect-defs -dialect=acc)
-mlir_tablegen(OpenACCOps.h.inc -gen-op-decls)
-mlir_tablegen(OpenACCOps.cpp.inc -gen-op-defs)
 mlir_tablegen(OpenACCOpsEnums.h.inc -gen-enum-decls)
 mlir_tablegen(OpenACCOpsEnums.cpp.inc -gen-enum-defs)
+add_public_tablegen_target(MLIROpenACCEnumsIncGen)
+add_dependencies(mlir-headers MLIROpenACCEnumsIncGen)
+
+set(LLVM_TARGET_DEFINITIONS OpenACCOps.td)
 mlir_tablegen(OpenACCOpsAttributes.h.inc -gen-attrdef-decls -attrdefs-dialect=acc)
 mlir_tablegen(OpenACCOpsAttributes.cpp.inc -gen-attrdef-defs -attrdefs-dialect=acc)
-add_mlir_doc(OpenACCOps OpenACCDialect Dialects/ -gen-dialect-doc)
-add_public_tablegen_target(MLIROpenACCOpsIncGen)
-add_dependencies(OpenACCDialectDocGen acc_common_td)
+add_public_tablegen_target(MLIROpenACCAttributesIncGen)
+add_dependencies(mlir-headers MLIROpenACCAttributesIncGen)
+
+set(LLVM_TARGET_DEFINITIONS OpenACCTypeInterfaces.td)
+mlir_tablegen(OpenACCTypeInterfaces.h.inc -gen-type-interface-decls)
+mlir_tablegen(OpenACCTypeInterfaces.cpp.inc -gen-type-interface-defs)
+add_public_tablegen_target(MLIROpenACCTypeInterfacesIncGen)
+add_dependencies(mlir-headers MLIROpenACCTypeInterfacesIncGen)

mlir/include/mlir/Dialect/OpenACC/OpenACC.h

 //===- OpenACC.h - MLIR OpenACC Dialect -------------------------*- C++ -*-===//
 //
 // Part of the MLIR 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 declares the OpenACC dialect in MLIR.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef MLIR_DIALECT_OPENACC_OPENACC_H_
 #define MLIR_DIALECT_OPENACC_OPENACC_H_
 
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
 
 #include "mlir/Dialect/OpenACC/OpenACCOpsDialect.h.inc"
 #include "mlir/Dialect/OpenACC/OpenACCOpsEnums.h.inc"
+#include "mlir/Dialect/OpenACC/OpenACCTypeInterfaces.h.inc"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
+
+#define GET_TYPEDEF_CLASSES
+#include "mlir/Dialect/OpenACC/OpenACCOpsTypes.h.inc"
 
 #define GET_ATTRDEF_CLASSES
 #include "mlir/Dialect/OpenACC/OpenACCOpsAttributes.h.inc"
 
 #define GET_OP_CLASSES
 #include "mlir/Dialect/OpenACC/OpenACCOps.h.inc"
 
 namespace mlir {

mlir/include/mlir/Dialect/OpenACC/OpenACCBase.td

+//===- OpenACCBase.td - OpenACC dialect definition ---------*- tablegen -*-===//
+//
+// Part of the MLIR 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
+//
+// =============================================================================
+//
+// Defines MLIR OpenACC dialect.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef OPENACC_BASE
+#define OPENACC_BASE
+
+include "mlir/IR/AttrTypeBase.td"
+
+def OpenACC_Dialect : Dialect {
+  let name = "acc";
+
+  let summary = "An OpenACC dialect for MLIR.";
+
+  let description = [{
+    This dialect models the construct from the OpenACC 3.1 directive language.
+  }];
+
+  let useDefaultAttributePrinterParser = 1;
+  let useDefaultTypePrinterParser = 1;
+  let cppNamespace = "::mlir::acc";
+  let dependentDialects = ["::mlir::memref::MemRefDialect","::mlir::LLVM::LLVMDialect"];
+}
+
+#endif // OPENACC_BASE

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

-//===- OpenACC.td - OpenACC operation definitions ----------*- tablegen -*-===//
+//===- OpenACCOps.td - OpenACC operation definitions ----------*- tablegen -*-===//
 //
 // Part of the MLIR 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
 //
 // =============================================================================
 //
 // Defines MLIR OpenACC operations.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef OPENACC_OPS
 #define OPENACC_OPS
 
+include "mlir/Interfaces/SideEffectInterfaces.td"
+include "mlir/IR/BuiltinTypes.td"
 include "mlir/IR/EnumAttr.td"
 include "mlir/IR/OpBase.td"
-
-def OpenACC_Dialect : Dialect {
-  let name = "acc";
-
-  let summary = "An OpenACC dialect for MLIR.";
-
-  let description = [{
-    This dialect models the construct from the OpenACC 3.1 directive language.
-  }];
-
-  let useDefaultAttributePrinterParser = 1;
-  let cppNamespace = "::mlir::acc";
-}
+include "mlir/Dialect/OpenACC/OpenACCBase.td"
+include "mlir/Dialect/OpenACC/OpenACCOpsTypes.td"
+include "mlir/Dialect/OpenACC/OpenACCTypeInterfaces.td"
 
 // AccCommon requires definition of OpenACC_Dialect.
 include "mlir/Dialect/OpenACC/AccCommon.td"
 
 // Base class for OpenACC dialect ops.
 class OpenACC_Op<string mnemonic, list<Trait> traits = []> :
   Op<OpenACC_Dialect, mnemonic, traits>;
 
def OpenACC_ReductionOp : I32EnumAttr<"ReductionOp",
   let cppNamespace = "::mlir::acc";
 }
 def OpenACC_ReductionOpAttr : EnumAttr<OpenACC_Dialect, OpenACC_ReductionOp,
                                        "reduction_op">;
 
 // Type used in operation below.
 def IntOrIndex : AnyTypeOf<[AnyInteger, Index]>;
 
+// Simple alias to pointer-like interface to reduce verbosity.
+def OpenACC_PointerLikeType : TypeAlias<OpenACC_PointerLikeTypeInterface,
+  "pointer-like type">;
+
+// Define the OpenACC data operations. There are a few cases where a modifier
+// is used, like create(zero), copyin(readonly), and copyout(zero). Since in
+// some cases we decompose the original acc data operation into multiple acc
+// dialect operations, we need to keep track of original operation. Thus even
+// for the operations with modifier, we create separate operation to make this
+// possible.
+def OpenACC_NoOp              : I64EnumAttrCase<"acc_noop", 0>;
+def OpenACC_CopyinOp          : I64EnumAttrCase<"acc_copyin", 1>;
+def OpenACC_CopyinReadonlyOp  : I64EnumAttrCase<"acc_copyin_readonly", 2>;
+def OpenACC_CopyOp            : I64EnumAttrCase<"acc_copy", 3>;
+def OpenACC_CopyoutOp         : I64EnumAttrCase<"acc_copyout", 4>;
+def OpenACC_CopyoutZeroOp     : I64EnumAttrCase<"acc_copyout_zero", 5>;
+def OpenACC_PresentOp         : I64EnumAttrCase<"acc_present", 6>;
+def OpenACC_CreateOp          : I64EnumAttrCase<"acc_create", 7>;
+def OpenACC_CreateZeroOp      : I64EnumAttrCase<"acc_create_zero", 8>;
+def OpenACC_DeleteOp          : I64EnumAttrCase<"acc_delete", 9>;
+def OpenACC_AttachOp          : I64EnumAttrCase<"acc_attach", 10>;
+def OpenACC_DetachOp          : I64EnumAttrCase<"acc_detach", 11>;
+def OpenACC_NoCreateOp        : I64EnumAttrCase<"acc_no_create", 12>;
+def OpenACC_PrivateOp         : I64EnumAttrCase<"acc_private", 13>;
+def OpenACC_FirstPrivateOp    : I64EnumAttrCase<"acc_firstprivate", 14>;
+def OpenACC_IsDevicePtrOp     : I64EnumAttrCase<"acc_deviceptr", 15>;
+def OpenACC_GetDevicePtrOp    : I64EnumAttrCase<"acc_getdeviceptr", 16>;
+
+def OpenACC_DataClauseEnum : I64EnumAttr<"DataClause",
+    "data clauses supported by OpenACC",
+    [OpenACC_NoOp, OpenACC_CopyinOp, OpenACC_CopyinReadonlyOp, OpenACC_CopyOp,
+     OpenACC_CopyoutOp, OpenACC_CopyoutZeroOp, OpenACC_PresentOp,
+     OpenACC_CreateOp, OpenACC_CreateZeroOp, OpenACC_DeleteOp,
+     OpenACC_AttachOp, OpenACC_DetachOp, OpenACC_NoCreateOp,
+     OpenACC_PrivateOp, OpenACC_FirstPrivateOp, OpenACC_IsDevicePtrOp,
+     OpenACC_GetDevicePtrOp
+    ]> {
+  let cppNamespace = "::mlir::acc";
+}
+
+// Used for data specification in data clauses (2.7.1).
+// Either (or both) extent and upperbound must be specified.
+def OpenACC_DataBounds : OpenACC_Op<"bounds", [AttrSizedOperandSegments, NoMemoryEffect]> {
+  let summary = "Represents bounds information for acc data clause.";
+
+  let arguments = (ins Optional<AnyType>:$lowerbound,
+                       Optional<AnyType>:$upperbound,
+                       Optional<AnyType>:$extent,
+                       Optional<AnyType>:$stride,
+                       DefaultValuedAttr<BoolAttr, "false">:$strideInBytes,
+                       Optional<AnyType>:$startIdx);
+  let results = (outs OpenACC_DataBoundsType:$result);
+
+  let assemblyFormat = [{
+    oilist(
+        `lowerbound` `(` $lowerbound `:` type($lowerbound) `)`
+      | `upperbound` `(` $upperbound `:` type($upperbound) `)`
+      | `extent` `(` $extent `:` type($extent) `)`
+      | `stride` `(` $stride `:` type($stride) `)`
+      | `startIdx` `(` $startIdx `:` type($startIdx) `)`
+    ) attr-dict
+  }];
+
+  let hasVerifier = 1;
+}
+
+// Data entry clause does not refer to OpenACC spec terminology, but to terminology
+// used in this dialect. It refers to data operations that will appear before
+// data or compute region. It will be used as the base of acc dialect operations
+// for the following OpenACC data clauses: copyin, create, present, attach, deviceptr.
+//
+// Memory Effects are not yet modeled in the best way - we have both host and device
+// effects. Since there is no ssa-modeled dependency between memory operations,
+// for now mark all operations as reading so they cannot be reordered across
+// acc regions. Since the data entry operations also produce a memory reference,
+// any writes to that memory will be explicitly seen in the region it is used in.
+// Hence why we don't have to model it as write from the mapping operation standpoint.
+class OpenACC_DataEntryClause<string mnemonic, string clause, list<Trait> traits = []> :
+    OpenACC_Op<mnemonic, !listconcat(traits,
+        [AttrSizedOperandSegments, MemoryEffects<[MemRead]>])> {
+  let arguments = (ins OpenACC_PointerLikeTypeInterface:$varPtr,
+                       Optional<OpenACC_PointerLikeTypeInterface>:$varPtrPtr,
+                       Variadic<OpenACC_DataBoundsType>:$bounds,
+                       DefaultValuedAttr<OpenACC_DataClauseEnum,clause>:$dataClause,
+                       OptionalAttr<OpenACC_DataClauseEnum>:$decomposedFrom,
+                       DefaultValuedAttr<BoolAttr, "true">:$structured,
+                       DefaultValuedAttr<BoolAttr, "false">:$implicit,
+                       OptionalAttr<StrAttr>:$name);
+  let results = (outs OpenACC_PointerLikeTypeInterface:$accPtr);
+
+  let assemblyFormat = [{
+    `varPtr` `(` $varPtr `:` type($varPtr) `)`
+    oilist(
+        `varPtrPtr` `(` $varPtrPtr `:` type($varPtrPtr) `)`
+      | `bounds` `(` $bounds `)`
+    ) `->` type($accPtr) attr-dict
+  }];
+
+  let hasVerifier = 1;
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.4 deviceptr clause
+//===----------------------------------------------------------------------===//
+def OpenACC_DevicePtrClause : OpenACC_DataEntryClause<"deviceptr",
+    "mlir::acc::DataClause::acc_deviceptr"> {
+  let summary = "Specifies that the variable pointer is a device pointer.";
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.5 present clause
+//===----------------------------------------------------------------------===//
+def OpenACC_PresentClause : OpenACC_DataEntryClause<"present",
+    "mlir::acc::DataClause::acc_present"> {
+  let summary = "Specifies that the variable is already present on device.";
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.7 copyin clause
+//===----------------------------------------------------------------------===//
+def OpenACC_CopyinClause : OpenACC_DataEntryClause<"copyin",
+    "mlir::acc::DataClause::acc_copyin"> {
+  let summary = "Represents copyin semantics for acc data clauses like acc copyin and acc copy.";
+
+  let extraClassDeclaration = [{
+    /// The number of data operands.
+    bool isCopyinReadonly();
+  }];
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.9 create clause
+//===----------------------------------------------------------------------===//
+def OpenACC_CreateClause : OpenACC_DataEntryClause<"create",
+    "mlir::acc::DataClause::acc_create"> {
+  let summary = "Represents create semantics for acc data clauses like acc create and acc copyout.";
+
+  let extraClassDeclaration = [{
+    /// The number of data operands.
+    bool isCreateZero();
+  }];
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.10 no_create clause
+//===----------------------------------------------------------------------===//
+def OpenACC_NoCreateClause : OpenACC_DataEntryClause<"nocreate",
+    "mlir::acc::DataClause::acc_no_create"> {
+  let summary = "Represents acc no_create semantics.";
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.12 attach clause
+//===----------------------------------------------------------------------===//
+def OpenACC_AttachClause : OpenACC_DataEntryClause<"attach",
+    "mlir::acc::DataClause::acc_attach"> {
+  let summary = "Represents acc attach semantics which updates a pointer in device memory with the corresponding device address of the pointee.";
+}
+
+//===----------------------------------------------------------------------===//
+// 3.2.23 acc_deviceptr
+//===----------------------------------------------------------------------===//
+// This is needed to get device address without the additional semantics in acc present.
+// It is also useful for providing the device address for unstructured construct exit_data
+// since unlike structured constructs, there is no matching data entry operation.
+def OpenACC_GetDevicePtr : OpenACC_DataEntryClause<"getdeviceptr",
+    "mlir::acc::DataClause::acc_getdeviceptr"> {
+  let summary = "Gets device address from host address if it exists on device.";
+}
+
+// Data exit clause does not refer to OpenACC spec terminology, but to terminology
+// used in this dialect. It refers to data operations that will appear after
+// data or compute region. It will be used as the base of acc dialect operations
+// for the following OpenACC data clauses: copyout, detach, delete.
+class OpenACC_DataExitClause<string mnemonic, string clause, list<Trait> traits = []> :
+    OpenACC_Op<mnemonic, !listconcat(traits,
+        [AttrSizedOperandSegments])> {
+  let arguments = (ins Optional<OpenACC_PointerLikeTypeInterface>:$varPtr,
+                       OpenACC_PointerLikeTypeInterface:$accPtr,
+                       Variadic<OpenACC_DataBoundsType>:$bounds,
+                       DefaultValuedAttr<OpenACC_DataClauseEnum,clause>:$dataClause,
+                       OptionalAttr<OpenACC_DataClauseEnum>:$decomposedFrom,
+                       DefaultValuedAttr<BoolAttr, "true">:$structured,
+                       DefaultValuedAttr<BoolAttr, "false">:$implicit,
+                       OptionalAttr<StrAttr>:$name);
+
+  let assemblyFormat = [{
+    `accPtr` `(` $accPtr `:` type($accPtr) `)`
+    oilist(
+        `bounds` `(` $bounds `)`
+      | `to` `varPtr` `(` $varPtr `:` type($varPtr) `)`
+    ) attr-dict
+  }];
+
+  let hasVerifier = 1;
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.8 copyout clause
+//===----------------------------------------------------------------------===//
+def OpenACC_CopyoutClause : OpenACC_DataExitClause<"copyout",
+    "mlir::acc::DataClause::acc_copyout", [MemoryEffects<[MemWrite]>]> {
+  let summary = "Represents acc copyout semantics - reverse of copyin.";
+
+  let extraClassDeclaration = [{
+    /// The number of data operands.
+    bool isCopyoutZero();
+  }];
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.11 delete clause
+//===----------------------------------------------------------------------===//
+def OpenACC_DeleteClause : OpenACC_DataExitClause<"delete",
+    "mlir::acc::DataClause::acc_delete", [MemoryEffects<[MemRead]>]> {
+  let summary = "Represents acc delete semantics - reverse of create.";
+}
+
+//===----------------------------------------------------------------------===//
+// 2.7.13 detach clause
+//===----------------------------------------------------------------------===//
+def OpenACC_DetachClause : OpenACC_DataExitClause<"detach",
+    "mlir::acc::DataClause::acc_detach", [MemoryEffects<[MemRead]>]> {
+  let summary = "Represents acc detach semantics - reverse of attach.";
+}
+
 //===----------------------------------------------------------------------===//
 // 2.5.1 parallel Construct
 //===----------------------------------------------------------------------===//
 
 def OpenACC_ParallelOp : OpenACC_Op<"parallel",
-    [AttrSizedOperandSegments]> {
+    [AttrSizedOperandSegments, RecursiveMemoryEffects]> {
   let summary = "parallel construct";
   let description = [{
     The "acc.parallel" operation represents a parallel construct block. It has
     one region to be executed in parallel on the current device.
 
     Example:
 
     ```mlir
let arguments = (ins Optional<IntOrIndex>:$async,
                        Variadic<AnyType>:$createOperands,
                        Variadic<AnyType>:$createZeroOperands,
                        Variadic<AnyType>:$noCreateOperands,
                        Variadic<AnyType>:$presentOperands,
                        Variadic<AnyType>:$devicePtrOperands,
                        Variadic<AnyType>:$attachOperands,
                        Variadic<AnyType>:$gangPrivateOperands,
                        Variadic<AnyType>:$gangFirstPrivateOperands,
+                       Variadic<AnyType>:$dataClauseOperands,
                        OptionalAttr<DefaultValueAttr>:$defaultAttr);
 
   let regions = (region AnyRegion:$region);
 
   let extraClassDeclaration = [{
     /// The number of data operands.
     unsigned getNumDataOperands();
 
     /// The i-th data operand passed.
     Value getDataOperand(unsigned i);
   }];
 
   let assemblyFormat = [{
     oilist(
-        `attach` `(` $attachOperands `:` type($attachOperands) `)`
+        `dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
+      | `attach` `(` $attachOperands `:` type($attachOperands) `)`
       | `async` `(` $async `:` type($async) `)`
       | `copy` `(` $copyOperands `:` type($copyOperands) `)`
       | `copyin` `(` $copyinOperands `:` type($copyinOperands) `)`
       | `copyin_readonly` `(` $copyinReadonlyOperands `:`
           type($copyinReadonlyOperands) `)`
       | `copyout` `(` $copyoutOperands `:` type($copyoutOperands) `)`
       | `copyout_zero` `(` $copyoutZeroOperands `:`
           type($copyoutZeroOperands) `)`
let assemblyFormat = [{
     $region attr-dict-with-keyword
   }];
 }
 
 //===----------------------------------------------------------------------===//
 // 2.5.2 serial Construct
 //===----------------------------------------------------------------------===//
 
-def OpenACC_SerialOp : OpenACC_Op<"serial", [AttrSizedOperandSegments]> {
+def OpenACC_SerialOp : OpenACC_Op<"serial",
+    [AttrSizedOperandSegments, RecursiveMemoryEffects]> {
   let summary = "serial construct";
   let description = [{
     The "acc.serial" operation represents a serial construct block. It has
     one region to be executed in serial on the current device.
 
     Example:
 
     ```mlir
let arguments = (ins Optional<IntOrIndex>:$async,
                        Variadic<AnyType>:$createOperands,
                        Variadic<AnyType>:$createZeroOperands,
                        Variadic<AnyType>:$noCreateOperands,
                        Variadic<AnyType>:$presentOperands,
                        Variadic<AnyType>:$devicePtrOperands,
                        Variadic<AnyType>:$attachOperands,
                        Variadic<AnyType>:$gangPrivateOperands,
                        Variadic<AnyType>:$gangFirstPrivateOperands,
+                       Variadic<AnyType>:$dataClauseOperands,
                        OptionalAttr<DefaultValueAttr>:$defaultAttr);
 
   let regions = (region AnyRegion:$region);
 
   let extraClassDeclaration = [{
     /// The number of data operands.
     unsigned getNumDataOperands();
 
     /// The i-th data operand passed.
     Value getDataOperand(unsigned i);
   }];
 
   let assemblyFormat = [{
     oilist(
-        `attach` `(` $attachOperands `:` type($attachOperands) `)`
+        `dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
+      | `attach` `(` $attachOperands `:` type($attachOperands) `)`
       | `async` `(` $async `:` type($async) `)`
       | `copy` `(` $copyOperands `:` type($copyOperands) `)`
       | `copyin` `(` $copyinOperands `:` type($copyinOperands) `)`
       | `copyin_readonly` `(` $copyinReadonlyOperands `:`
           type($copyinReadonlyOperands) `)`
       | `copyout` `(` $copyoutOperands `:` type($copyoutOperands) `)`
       | `copyout_zero` `(` $copyoutZeroOperands `:`
           type($copyoutZeroOperands) `)`
let assemblyFormat = [{
     $region attr-dict-with-keyword
   }];
 }
 
 //===----------------------------------------------------------------------===//
 // 2.5.1 kernels Construct
 //===----------------------------------------------------------------------===//
 
-def OpenACC_KernelsOp : OpenACC_Op<"kernels", [AttrSizedOperandSegments]> {
+def OpenACC_KernelsOp : OpenACC_Op<"kernels",
+    [AttrSizedOperandSegments, RecursiveMemoryEffects]> {
   let summary = "kernels construct";
   let description = [{
     The "acc.kernels" operation represents a kernels construct block. It has
     one region to be compiled into a sequence of kernels for execution on the
     current device.
 
     Example:
 
let arguments = (ins Optional<IntOrIndex>:$async,
                        Variadic<AnyType>:$copyoutOperands,
                        Variadic<AnyType>:$copyoutZeroOperands,
                        Variadic<AnyType>:$createOperands,
                        Variadic<AnyType>:$createZeroOperands,
                        Variadic<AnyType>:$noCreateOperands,
                        Variadic<AnyType>:$presentOperands,
                        Variadic<AnyType>:$devicePtrOperands,
                        Variadic<AnyType>:$attachOperands,
+                       Variadic<AnyType>:$dataClauseOperands,
                        OptionalAttr<DefaultValueAttr>:$defaultAttr);
 
   let regions = (region AnyRegion:$region);
 
   let extraClassDeclaration = [{
     /// The number of data operands.
     unsigned getNumDataOperands();
 
     /// The i-th data operand passed.
     Value getDataOperand(unsigned i);
   }];
 
   let assemblyFormat = [{
     oilist(
-        `attach` `(` $attachOperands `:` type($attachOperands) `)`
+        `dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
+      | `attach` `(` $attachOperands `:` type($attachOperands) `)`
       | `async` `(` $async `:` type($async) `)`
       | `copy` `(` $copyOperands `:` type($copyOperands) `)`
       | `copyin` `(` $copyinOperands `:` type($copyinOperands) `)`
       | `copyin_readonly` `(` $copyinReadonlyOperands `:`
           type($copyinReadonlyOperands) `)`
       | `copyout` `(` $copyoutOperands `:` type($copyoutOperands) `)`
       | `copyout_zero` `(` $copyoutZeroOperands `:`
           type($copyoutZeroOperands) `)`
def OpenACC_KernelsOp : OpenACC_Op<"kernels",
   }];
 }
 
 //===----------------------------------------------------------------------===//
 // 2.6.5 data Construct
 //===----------------------------------------------------------------------===//
 
 def OpenACC_DataOp : OpenACC_Op<"data",
-    [AttrSizedOperandSegments]> {
+    [AttrSizedOperandSegments, RecursiveMemoryEffects]> {
   let summary = "data construct";
 
   let description = [{
     The "acc.data" operation represents a data construct. It defines vars to
     be allocated in the current device memory for the duration of the region,
     whether data should be copied from local memory to the current device
     memory upon region entry , and copied from device memory to local memory
     upon region exit.
let arguments = (ins Optional<I1>:$ifCond,
                        Variadic<AnyType>:$copyoutOperands,
                        Variadic<AnyType>:$copyoutZeroOperands,
                        Variadic<AnyType>:$createOperands,
                        Variadic<AnyType>:$createZeroOperands,
                        Variadic<AnyType>:$noCreateOperands,
                        Variadic<AnyType>:$presentOperands,
                        Variadic<AnyType>:$deviceptrOperands,
                        Variadic<AnyType>:$attachOperands,
+                       Variadic<AnyType>:$dataClauseOperands,
                        OptionalAttr<DefaultValueAttr>:$defaultAttr);
 
   let regions = (region AnyRegion:$region);
 
   let extraClassDeclaration = [{
     /// The number of data operands.
     unsigned getNumDataOperands();
 
     /// The i-th data operand passed.
     Value getDataOperand(unsigned i);
   }];
 
   let assemblyFormat = [{
     oilist(
         `if` `(` $ifCond `)`
+      | `dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
       | `copy` `(` $copyOperands `:` type($copyOperands) `)`
       | `copyin` `(` $copyinOperands `:` type($copyinOperands) `)`
       | `copyin_readonly` `(` $copyinReadonlyOperands `:`
             type($copyinReadonlyOperands) `)`
       | `copyout` `(` $copyoutOperands `:` type($copyoutOperands) `)`
       | `copyout_zero` `(` $copyoutZeroOperands `:`
             type($copyoutZeroOperands) `)`
       | `create` `(` $createOperands `:` type($createOperands) `)`
let arguments = (ins Optional<I1>:$ifCond,
                        Optional<IntOrIndex>:$asyncOperand,
                        UnitAttr:$async,
                        Optional<IntOrIndex>:$waitDevnum,
                        Variadic<IntOrIndex>:$waitOperands,
                        UnitAttr:$wait,
                        Variadic<AnyType>:$copyinOperands,
                        Variadic<AnyType>:$createOperands,
                        Variadic<AnyType>:$createZeroOperands,
-                       Variadic<AnyType>:$attachOperands);
+                       Variadic<AnyType>:$attachOperands,
+                       Variadic<AnyType>:$dataClauseOperands);
 
   let extraClassDeclaration = [{
     /// The number of data operands.
     unsigned getNumDataOperands();
 
     /// The i-th data operand passed.
     Value getDataOperand(unsigned i);
   }];
 
   let assemblyFormat = [{
     oilist(
         `if` `(` $ifCond `)`
       | `async` `(` $asyncOperand `:` type($asyncOperand) `)`
       | `wait_devnum` `(` $waitDevnum `:` type($waitDevnum) `)`
       | `wait` `(` $waitOperands `:` type($waitOperands) `)`
       | `copyin` `(` $copyinOperands `:` type($copyinOperands) `)`
       | `create` `(` $createOperands `:` type($createOperands) `)`
       | `create_zero` `(` $createZeroOperands `:`
           type($createZeroOperands) `)`
       | `attach` `(` $attachOperands `:` type($attachOperands) `)`
+      | `dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
     )
     attr-dict-with-keyword
   }];
 
   let hasCanonicalizer = 1;
   let hasVerifier = 1;
 }
 
let arguments = (ins Optional<I1>:$ifCond,
                        Optional<IntOrIndex>:$asyncOperand,
                        UnitAttr:$async,
                        Optional<IntOrIndex>:$waitDevnum,
                        Variadic<IntOrIndex>:$waitOperands,
                        UnitAttr:$wait,
                        Variadic<AnyType>:$copyoutOperands,
                        Variadic<AnyType>:$deleteOperands,
                        Variadic<AnyType>:$detachOperands,
+                       Variadic<AnyType>:$dataClauseOperands,
                        UnitAttr:$finalize);
 
   let extraClassDeclaration = [{
     /// The number of data operands.
     unsigned getNumDataOperands();
 
     /// The i-th data operand passed.
     Value getDataOperand(unsigned i);
   }];
 
   let assemblyFormat = [{
     oilist(
         `if` `(` $ifCond `)`
       | `async` `(` $asyncOperand `:` type($asyncOperand) `)`
       | `wait_devnum` `(` $waitDevnum `:` type($waitDevnum) `)`
       | `wait` `(` $waitOperands `:` type($waitOperands) `)`
       | `copyout` `(` $copyoutOperands `:` type($copyoutOperands) `)`
       | `delete` `(` $deleteOperands `:` type($deleteOperands) `)`
       | `detach` `(` $detachOperands `:` type($detachOperands) `)`
+      | `dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
     )
     attr-dict-with-keyword
   }];
 
   let hasCanonicalizer = 1;
   let hasVerifier = 1;
 }
 
 //===----------------------------------------------------------------------===//
 // 2.9 loop Construct
 //===----------------------------------------------------------------------===//
 
-def OpenACC_LoopOp : OpenACC_Op<"loop", [AttrSizedOperandSegments]> {
+def OpenACC_LoopOp : OpenACC_Op<"loop", [AttrSizedOperandSegments, RecursiveMemoryEffects]> {
   let summary = "loop construct";
 
   let description = [{
     The "acc.loop" operation represents the OpenACC loop construct.
 
     Example:
 
     ```mlir

mlir/include/mlir/Dialect/OpenACC/OpenACCOpsTypes.td

+//===- OpenACCOpsTypes.td - OpenACC operation types definitions -*- tablegen -*-===//
+//
+// Part of the MLIR 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
+//
+// =============================================================================
+//
+// Defines MLIR OpenACC operation types.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef OPENACC_OPS_TYPES
+#define OPENACC_OPS_TYPES
+
+include "mlir/IR/AttrTypeBase.td"
+include "OpenACCBase.td"
+
+class OpenACC_Type<string name, string typeMnemonic> : TypeDef<OpenACC_Dialect, name> {
+  let mnemonic = typeMnemonic;
+}
+
+def OpenACC_DataBoundsType : OpenACC_Type<"DataBounds", "data_bounds_ty"> {
+  let summary = "Type for representing acc data clause bounds information";
+}
+
+#endif // OPENACC_OPS_TYPES

mlir/include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.td

+//===-- OpenACCTypeInterfaces.td - OpenACC type interfaces ---*- tablegen -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef OPENACC_TYPE_INTERFACES
+#define OPENACC_TYPE_INTERFACES
+
+include "mlir/IR/OpBase.td"
+
+def OpenACC_PointerLikeTypeInterface : TypeInterface<"PointerLikeType"> {
+  let cppNamespace = "::mlir::acc";
+
+  let description = [{
+    An interface for pointer-like types that point to an OpenACC var.
+  }];
+
+  // By convention, any of the pointer types associated with this interface
+  // will need to provide getElementType.
+  let methods = [
+    InterfaceMethod<
+      /*description=*/[{
+        Returns the pointee type or null if the pointer has no pointee type
+      }],
+      /*retTy=*/"::mlir::Type",
+      /*methodName=*/"getElementType"
+    >,
+  ];
+}
+
+#endif // OPENACC_TYPE_INTERFACES

mlir/lib/Dialect/OpenACC/CMakeLists.txt

 add_mlir_dialect_library(MLIROpenACCDialect
   IR/OpenACC.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenACC
 
   DEPENDS
   MLIROpenACCOpsIncGen
+  MLIROpenACCEnumsIncGen
+  MLIROpenACCAttributesIncGen
+  MLIROpenACCTypeInterfacesIncGen
 
   LINK_LIBS PUBLIC
   MLIRIR
   )
 

mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp

 //===- OpenACC.cpp - OpenACC MLIR Operations ------------------------------===//
 //
 // Part of the MLIR 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
 //
 // =============================================================================
 
 #include "mlir/Dialect/OpenACC/OpenACC.h"
-#include "mlir/Dialect/OpenACC/OpenACCOpsEnums.cpp.inc"
+#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
+#include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "llvm/ADT/TypeSwitch.h"
 
 using namespace mlir;
 using namespace acc;
 
 #include "mlir/Dialect/OpenACC/OpenACCOpsDialect.cpp.inc"
+#include "mlir/Dialect/OpenACC/OpenACCOpsEnums.cpp.inc"
+#include "mlir/Dialect/OpenACC/OpenACCTypeInterfaces.cpp.inc"
 
 //===----------------------------------------------------------------------===//
 // OpenACC operations
 //===----------------------------------------------------------------------===//
 
 void OpenACCDialect::initialize() {
   addOperations<
 #define GET_OP_LIST
 #include "mlir/Dialect/OpenACC/OpenACCOps.cpp.inc"
       >();
   addAttributes<
 #define GET_ATTRDEF_LIST
 #include "mlir/Dialect/OpenACC/OpenACCOpsAttributes.cpp.inc"
       >();
+  addTypes<
+#define GET_TYPEDEF_LIST
+#include "mlir/Dialect/OpenACC/OpenACCOpsTypes.cpp.inc"
+      >();
+
+  // By attaching interfaces here, we make the OpenACC dialect dependent on
+  // the other dialects. This is probably better than having dialects like LLVM
+  // and memref be dependent on OpenACC.
+  LLVM::LLVMPointerType::attachInterface<PointerLikeType>(*getContext());
+  MemRefType::attachInterface<PointerLikeType>(*getContext());
+}
+
+//===----------------------------------------------------------------------===//
+// DataBounds
+//===----------------------------------------------------------------------===//
+LogicalResult acc::DataBounds::verify() {
+  auto extent = getExtent();
+  auto upperbound = getUpperbound();
+  if (!extent && !upperbound) {
+    return emitError("expected extent or upperbound.");
+  }
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
+// DevicePtrClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::DevicePtrClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_deviceptr) {
+    return emitError("data clause associated with deviceptr operation must "
+                     "match its intent");
+  }
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
+// PresentClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::PresentClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_present) {
+    return emitError(
+        "data clause associated with present operation must match its intent");
+  }
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
+// CopyinClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::CopyinClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_copyin &&
+      getDataClause() != acc::DataClause::acc_copyin_readonly) {
+    return emitError(
+        "data clause associated with copyin operation must match its intent");
+  }
+  return success();
+}
+
+bool acc::CopyinClause::isCopyinReadonly() {
+  return getDataClause() == acc::DataClause::acc_copyin_readonly;
+}
+
+//===----------------------------------------------------------------------===//
+// CreateClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::CreateClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_create &&
+      getDataClause() != acc::DataClause::acc_create_zero) {
+    return emitError(
+        "data clause associated with create operation must match its intent");
+  }
+  return success();
+}
+
+bool acc::CreateClause::isCreateZero() {
+  return getDataClause() == acc::DataClause::acc_create_zero;
+}
+
+//===----------------------------------------------------------------------===//
+// NoCreateClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::NoCreateClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_no_create) {
+    return emitError("data clause associated with no_create operation must "
+                     "match its intent");
+  }
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
+// AttachClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::AttachClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_attach) {
+    return emitError(
+        "data clause associated with attach operation must match its intent");
+  }
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
+// GetDevicePtr
+//===----------------------------------------------------------------------===//
+LogicalResult acc::GetDevicePtr::verify() {
+  if (getDataClause() != acc::DataClause::acc_getdeviceptr) {
+    return emitError("getDevicePtr mismatch");
+  }
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
+// CopyoutClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::CopyoutClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_copyout &&
+      getDataClause() != acc::DataClause::acc_copyout_zero) {
+    return emitError(
+        "data clause associated with copyout operation must match its intent");
+  }
+  if (!getVarPtr() || !getAccPtr()) {
+    return emitError("must have both host and device pointers");
+  }
+  return success();
+}
+
+bool acc::CopyoutClause::isCopyoutZero() {
+  return getDataClause() == acc::DataClause::acc_copyout_zero;
+}
+
+//===----------------------------------------------------------------------===//
+// DeleteClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::DeleteClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_delete) {
+    return emitError(
+        "data clause associated with delete operation must match its intent");
+  }
+  if (!getVarPtr() && !getAccPtr()) {
+    return emitError("must have either host or device pointer");
+  }
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
+// DetachClause
+//===----------------------------------------------------------------------===//
+LogicalResult acc::DetachClause::verify() {
+  if (getDataClause() != acc::DataClause::acc_detach) {
+    return emitError(
+        "data clause associated with detach operation must match its intent");
+  }
+  if (!getVarPtr() && !getAccPtr()) {
+    return emitError("must have either host or device pointer");
+  }
+  return success();
 }
 
 template <typename StructureOp>
 static ParseResult parseRegions(OpAsmParser &parser, OperationState &state,
                                 unsigned nRegions = 1) {
 
   SmallVector<Region *, 2> regions;
   for (unsigned i = 0; i < nRegions; ++i)
     regions.push_back(state.addRegion());
 
   for (Region *region : regions) {
-    if (parser.parseRegion(*region, /*arguments=*/{}, /*argTypes=*/{}))
+    if (parser.parseRegion(*region, /*arguments=*/{},
+                           /*enableNameShadowing=*/{}))
       return failure();
   }
 
   return success();
 }
 
 static ParseResult
 parseOperandList(OpAsmParser &parser, StringRef keyword,

 
 unsigned ParallelOp::getNumDataOperands() {
   return getReductionOperands().size() + getCopyOperands().size() +
          getCopyinOperands().size() + getCopyinReadonlyOperands().size() +
          getCopyoutOperands().size() + getCopyoutZeroOperands().size() +
          getCreateOperands().size() + getCreateZeroOperands().size() +
          getNoCreateOperands().size() + getPresentOperands().size() +
          getDevicePtrOperands().size() + getAttachOperands().size() +
-         getGangPrivateOperands().size() + getGangFirstPrivateOperands().size();
+         getGangPrivateOperands().size() +
+         getGangFirstPrivateOperands().size() + getDataClauseOperands().size();
 }
 
 Value ParallelOp::getDataOperand(unsigned i) {
   unsigned numOptional = getAsync() ? 1 : 0;
   numOptional += getNumGangs() ? 1 : 0;
   numOptional += getNumWorkers() ? 1 : 0;
   numOptional += getVectorLength() ? 1 : 0;
   numOptional += getIfCond() ? 1 : 0;
   numOptional += getSelfCond() ? 1 : 0;
   return getOperand(getWaitOperands().size() + numOptional + i);
 }
 
 //===----------------------------------------------------------------------===//
 // SerialOp
 //===----------------------------------------------------------------------===//
 
 unsigned SerialOp::getNumDataOperands() {
   return getReductionOperands().size() + getCopyOperands().size() +
          getCopyinOperands().size() + getCopyinReadonlyOperands().size() +
          getCopyoutOperands().size() + getCopyoutZeroOperands().size() +
          getCreateOperands().size() + getCreateZeroOperands().size() +
          getNoCreateOperands().size() + getPresentOperands().size() +
          getDevicePtrOperands().size() + getAttachOperands().size() +
-         getGangPrivateOperands().size() + getGangFirstPrivateOperands().size();
+         getGangPrivateOperands().size() +
+         getGangFirstPrivateOperands().size() + getDataClauseOperands().size();
 }
 
 Value SerialOp::getDataOperand(unsigned i) {
   unsigned numOptional = getAsync() ? 1 : 0;
   numOptional += getIfCond() ? 1 : 0;
   numOptional += getSelfCond() ? 1 : 0;
   return getOperand(getWaitOperands().size() + numOptional + i);
 }
 
 //===----------------------------------------------------------------------===//
 // KernelsOp
 //===----------------------------------------------------------------------===//
 
 unsigned KernelsOp::getNumDataOperands() {
   return getCopyOperands().size() + getCopyinOperands().size() +
          getCopyinReadonlyOperands().size() + getCopyoutOperands().size() +
          getCopyoutZeroOperands().size() + getCreateOperands().size() +
          getCreateZeroOperands().size() + getNoCreateOperands().size() +
          getPresentOperands().size() + getDevicePtrOperands().size() +
-         getAttachOperands().size();
+         getAttachOperands().size() + getDataClauseOperands().size();
 }
 
 Value KernelsOp::getDataOperand(unsigned i) {
   unsigned numOptional = getAsync() ? 1 : 0;
   numOptional += getIfCond() ? 1 : 0;
   numOptional += getSelfCond() ? 1 : 0;
   return getOperand(getWaitOperands().size() + numOptional + i);
 }

 }
 
 unsigned DataOp::getNumDataOperands() {
   return getCopyOperands().size() + getCopyinOperands().size() +
          getCopyinReadonlyOperands().size() + getCopyoutOperands().size() +
          getCopyoutZeroOperands().size() + getCreateOperands().size() +
          getCreateZeroOperands().size() + getNoCreateOperands().size() +
          getPresentOperands().size() + getDeviceptrOperands().size() +
-         getAttachOperands().size();
+         getAttachOperands().size() + getDataClauseOperands().size();
 }
 
 Value DataOp::getDataOperand(unsigned i) {
   unsigned numOptional = getIfCond() ? 1 : 0;
   return getOperand(numOptional + i);
 }
 
 //===----------------------------------------------------------------------===//
 // ExitDataOp
 //===----------------------------------------------------------------------===//
 
 LogicalResult acc::ExitDataOp::verify() {
   // 2.6.6. Data Exit Directive restriction
   // At least one copyout, delete, or detach clause must appear on an exit data
   // directive.
   if (getCopyoutOperands().empty() && getDeleteOperands().empty() &&
-      getDetachOperands().empty())
+      getDetachOperands().empty() && getDataClauseOperands().empty())
     return emitError(
         "at least one operand in copyout, delete or detach must appear on the "
         "exit data operation");
 
   // The async attribute represent the async clause without value. Therefore the
   // attribute and operand cannot appear at the same time.
   if (getAsyncOperand() && getAsync())
     return emitError("async attribute cannot appear with asyncOperand");
 
   // The wait attribute represent the wait clause without values. Therefore the
   // attribute and operands cannot appear at the same time.
   if (!getWaitOperands().empty() && getWait())
     return emitError("wait attribute cannot appear with waitOperands");
 
   if (getWaitDevnum() && getWaitOperands().empty())
     return emitError("wait_devnum cannot appear without waitOperands");
 
   return success();
 }
 
 unsigned ExitDataOp::getNumDataOperands() {
   return getCopyoutOperands().size() + getDeleteOperands().size() +
-         getDetachOperands().size();
+         getDetachOperands().size() + getDataClauseOperands().size();
 }
 
 Value ExitDataOp::getDataOperand(unsigned i) {
   unsigned numOptional = getIfCond() ? 1 : 0;
   numOptional += getAsyncOperand() ? 1 : 0;
   numOptional += getWaitDevnum() ? 1 : 0;
   return getOperand(getWaitOperands().size() + numOptional + i);
 }
 
 void ExitDataOp::getCanonicalizationPatterns(RewritePatternSet &results,
                                              MLIRContext *context) {
   results.add<RemoveConstantIfCondition<ExitDataOp>>(context);
 }
 
 //===----------------------------------------------------------------------===//
 // EnterDataOp
 //===----------------------------------------------------------------------===//
 
 LogicalResult acc::EnterDataOp::verify() {
   // 2.6.6. Data Enter Directive restriction
   // At least one copyin, create, or attach clause must appear on an enter data
   // directive.
   if (getCopyinOperands().empty() && getCreateOperands().empty() &&
-      getCreateZeroOperands().empty() && getAttachOperands().empty())
+      getCreateZeroOperands().empty() && getAttachOperands().empty() &&
+      getDataClauseOperands().empty())
     return emitError(
         "at least one operand in copyin, create, "
         "create_zero or attach must appear on the enter data operation");
 
   // The async attribute represent the async clause without value. Therefore the
   // attribute and operand cannot appear at the same time.
   if (getAsyncOperand() && getAsync())
     return emitError("async attribute cannot appear with asyncOperand");
 
   // The wait attribute represent the wait clause without values. Therefore the
   // attribute and operands cannot appear at the same time.
   if (!getWaitOperands().empty() && getWait())
     return emitError("wait attribute cannot appear with waitOperands");
 
   if (getWaitDevnum() && getWaitOperands().empty())
     return emitError("wait_devnum cannot appear without waitOperands");
 
   return success();
 }
 
 unsigned EnterDataOp::getNumDataOperands() {
   return getCopyinOperands().size() + getCreateOperands().size() +
-         getCreateZeroOperands().size() + getAttachOperands().size();
+         getCreateZeroOperands().size() + getAttachOperands().size() +
+         getDataClauseOperands().size();
 }
 
 Value EnterDataOp::getDataOperand(unsigned i) {
   unsigned numOptional = getIfCond() ? 1 : 0;
   numOptional += getAsyncOperand() ? 1 : 0;
   numOptional += getWaitDevnum() ? 1 : 0;
   return getOperand(getWaitOperands().size() + numOptional + i);
 }
LogicalResult acc::WaitOp::verify() {
   return success();
 }
 
 #define GET_OP_CLASSES
 #include "mlir/Dialect/OpenACC/OpenACCOps.cpp.inc"
 
 #define GET_ATTRDEF_CLASSES
 #include "mlir/Dialect/OpenACC/OpenACCOpsAttributes.cpp.inc"
+
+#define GET_TYPEDEF_CLASSES
+#include "mlir/Dialect/OpenACC/OpenACCOpsTypes.cpp.inc"

mlir/test/Dialect/OpenACC/ops.mlir

 // CHECK: acc.enter_data create([[ARGA]] : memref<10xf32>) create_zero([[ARGB]], [[ARGC]] : memref<10xf32>, memref<10x10xf32>)
 // CHECK: acc.enter_data attach([[ARGA]] : memref<10xf32>)
 // CHECK: acc.enter_data copyin([[ARGA]] : memref<10xf32>) attributes {async}
 // CHECK: acc.enter_data create([[ARGA]] : memref<10xf32>) attributes {wait}
 // CHECK: acc.enter_data async([[I64VALUE]] : i64) copyin([[ARGA]] : memref<10xf32>)
 // CHECK: acc.enter_data async([[I64VALUE]] : i64) copyin([[ARGA]] : memref<10xf32>)
 // CHECK: acc.enter_data if([[IFCOND]]) copyin([[ARGA]] : memref<10xf32>)
 // CHECK: acc.enter_data wait_devnum([[I64VALUE]] : i64) wait([[I32VALUE]], [[IDXVALUE]] : i32, index) copyin([[ARGA]] : memref<10xf32>)
+
+// -----
+
+func.func @teststructureddataclauseops(%a: memref<10xf32>, %b: memref<memref<10xf32>>, %c: memref<10x20xf32>) -> () {
+  %deviceptr = acc.deviceptr varPtr(%a : memref<10xf32>) -> memref<10xf32> {name = "arrayA"}
+  acc.parallel dataOperands(%deviceptr : memref<10xf32>) {
+  }
+
+  %present = acc.present varPtr(%a : memref<10xf32>) -> memref<10xf32>
+  acc.data dataOperands(%present : memref<10xf32>) {
+  }
+
+  %copyin = acc.copyin varPtr(%a : memref<10xf32>) -> memref<10xf32>
+  acc.parallel dataOperands(%copyin : memref<10xf32>) {
+  }
+
+  %copyinreadonly = acc.copyin varPtr(%a : memref<10xf32>) -> memref<10xf32> {dataClause = 2}
+  acc.kernels dataOperands(%copyinreadonly : memref<10xf32>) {
+  }
+
+  %copyinfromcopy = acc.copyin varPtr(%a : memref<10xf32>) -> memref<10xf32> {decomposedFrom = 3}
+  acc.serial dataOperands(%copyinfromcopy : memref<10xf32>) {
+  }
+  acc.copyout accPtr(%copyinfromcopy : memref<10xf32>) to varPtr(%a : memref<10xf32>) {decomposedFrom = 3}
+
+  %create = acc.create varPtr(%a : memref<10xf32>) -> memref<10xf32>
+  %createimplicit = acc.create varPtr(%c : memref<10x20xf32>) -> memref<10x20xf32> {implicit = true}
+  acc.parallel dataOperands(%create, %createimplicit : memref<10xf32>, memref<10x20xf32>) {
+  }
+  acc.delete accPtr(%create : memref<10xf32>) {decomposedFrom = 7}
+  acc.delete accPtr(%createimplicit : memref<10x20xf32>) {decomposedFrom = 7, implicit = true}
+
+  %copyoutzero = acc.create varPtr(%a : memref<10xf32>) -> memref<10xf32> {decomposedFrom = 5}
+  acc.parallel dataOperands(%copyoutzero: memref<10xf32>) {
+  }
+  acc.copyout accPtr(%copyoutzero : memref<10xf32>) to varPtr(%a : memref<10xf32>) {dataClause = 5}
+
+  %attach = acc.attach varPtr(%b : memref<memref<10xf32>>) -> memref<memref<10xf32>>
+  acc.parallel dataOperands(%attach : memref<memref<10xf32>>) {
+  }
+  acc.detach accPtr(%attach : memref<memref<10xf32>>) {decomposedFrom = 10}
+
+  %copyinparent = acc.copyin varPtr(%a : memref<10xf32>) varPtrPtr(%b : memref<memref<10xf32>>) -> memref<10xf32> {decomposedFrom = 3}
+  acc.parallel dataOperands(%copyinparent : memref<10xf32>) {
+  }
+  acc.copyout accPtr(%copyinparent : memref<10xf32>) to varPtr(%a : memref<10xf32>) {decomposedFrom = 3}
+
+  %c0 = arith.constant 0 : index
+  %c1 = arith.constant 1 : index
+  %c4 = arith.constant 4 : index
+  %c9 = arith.constant 9 : index
+  %c10 = arith.constant 10 : index
+  %c20 = arith.constant 20 : index
+
+  %bounds1full = acc.bounds lowerbound(%c0 : index) upperbound(%c9 : index) stride(%c1 : index)
+  %copyinfullslice1 = acc.copyin varPtr(%a : memref<10xf32>) bounds(%bounds1full) -> memref<10xf32> {name = "arrayA[0:9]"}
+  // Specify full-bounds but assume that startIdx of array reference is 1.
+  %bounds2full = acc.bounds lowerbound(%c1 : index) upperbound(%c20 : index) extent(%c20 : index) stride(%c4 : index) startIdx(%c1 : index) {strideInBytes = true}
+  %copyinfullslice2 = acc.copyin varPtr(%c : memref<10x20xf32>) bounds(%bounds1full, %bounds2full) -> memref<10x20xf32>
+  acc.parallel dataOperands(%copyinfullslice1, %copyinfullslice2 : memref<10xf32>, memref<10x20xf32>) {
+  }
+
+  %bounds1partial = acc.bounds lowerbound(%c4 : index) upperbound(%c9 : index) stride(%c1 : index)
+  %copyinpartial = acc.copyin varPtr(%a : memref<10xf32>) bounds(%bounds1partial) -> memref<10xf32> {decomposedFrom = 3}
+  acc.parallel dataOperands(%copyinpartial : memref<10xf32>) {
+  }
+  acc.copyout accPtr(%copyinpartial : memref<10xf32>) bounds(%bounds1partial) to varPtr(%a : memref<10xf32>) {decomposedFrom = 3}
+
+  return
+}
+
+// CHECK: func.func @teststructureddataclauseops([[ARGA:%.*]]: memref<10xf32>, [[ARGB:%.*]]: memref<memref<10xf32>>, [[ARGC:%.*]]: memref<10x20xf32>) {
+// CHECK: [[DEVICEPTR:%.*]] = acc.deviceptr varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32> {name = "arrayA"}
+// CHECK-NEXT: acc.parallel dataOperands([[DEVICEPTR]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK: [[PRESENT:%.*]] = acc.present varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32>
+// CHECK-NEXT: acc.data dataOperands([[PRESENT]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK: [[COPYIN:%.*]] = acc.copyin varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32>
+// CHECK-NEXT: acc.parallel dataOperands([[COPYIN]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK: [[COPYINRO:%.*]] = acc.copyin varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32> {dataClause = 2 : i64}
+// CHECK-NEXT: acc.kernels dataOperands([[COPYINRO]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK: [[COPYINCOPY:%.*]] = acc.copyin varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32> {decomposedFrom = 3 : i64}
+// CHECK-NEXT: acc.serial dataOperands([[COPYINCOPY]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK-NEXT: acc.copyout accPtr([[COPYINCOPY]] : memref<10xf32>) to varPtr([[ARGA]] : memref<10xf32>) {decomposedFrom = 3 : i64}
+// CHECK: [[CREATE:%.*]] = acc.create varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32>
+// CHECK-NEXT: [[CREATEIMP:%.*]] = acc.create varPtr([[ARGC]] : memref<10x20xf32>) -> memref<10x20xf32> {implicit = true}
+// CHECK-NEXT: acc.parallel dataOperands([[CREATE]], [[CREATEIMP]] : memref<10xf32>, memref<10x20xf32>) {
+// CHECK-NEXT: }
+// CHECK-NEXT: acc.delete accPtr([[CREATE]] : memref<10xf32>) {decomposedFrom = 7 : i64}
+// CHECK-NEXT: acc.delete accPtr([[CREATEIMP]] : memref<10x20xf32>) {decomposedFrom = 7 : i64, implicit = true}
+// CHECK: [[COPYOUTZ:%.*]] = acc.create varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32> {decomposedFrom = 5 : i64}
+// CHECK-NEXT: acc.parallel dataOperands([[COPYOUTZ]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK-NEXT: acc.copyout accPtr([[COPYOUTZ]] : memref<10xf32>) to varPtr([[ARGA]] : memref<10xf32>) {dataClause = 5 : i64}
+// CHECK: [[ATTACH:%.*]] = acc.attach varPtr([[ARGB]] : memref<memref<10xf32>>) -> memref<memref<10xf32>>
+// CHECK-NEXT: acc.parallel dataOperands([[ATTACH]] : memref<memref<10xf32>>) {
+// CHECK-NEXT: }
+// CHECK-NEXT: acc.detach accPtr([[ATTACH]] : memref<memref<10xf32>>) {decomposedFrom = 10 : i64}
+// CHECK: [[COPYINP:%.*]] = acc.copyin varPtr([[ARGA]] : memref<10xf32>) varPtrPtr([[ARGB]] : memref<memref<10xf32>>) -> memref<10xf32> {decomposedFrom = 3 : i64}
+// CHECK-NEXT: acc.parallel dataOperands([[COPYINP]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK-NEXT: acc.copyout accPtr([[COPYINP]] : memref<10xf32>) to varPtr([[ARGA]] : memref<10xf32>) {decomposedFrom = 3 : i64}
+// CHECK-DAG: [[CON0:%.*]] = arith.constant 0 : index
+// CHECK-DAG: [[CON1:%.*]] = arith.constant 1 : index
+// CHECK-DAG: [[CON4:%.*]] = arith.constant 4 : index
+// CHECK-DAG: [[CON9:%.*]] = arith.constant 9 : index
+// CHECK-DAG: [[CON20:%.*]] = arith.constant 20 : index
+// CHECK: [[BOUNDS1F:%.*]] = acc.bounds lowerbound([[CON0]] : index) upperbound([[CON9]] : index) stride([[CON1]] : index)
+// CHECK-NEXT: [[COPYINF1:%.*]] = acc.copyin varPtr([[ARGA]] : memref<10xf32>) bounds([[BOUNDS1F]]) -> memref<10xf32> {name = "arrayA[0:9]"}
+// CHECK-NEXT: [[BOUNDS2F:%.*]] = acc.bounds lowerbound([[CON1]] : index) upperbound([[CON20]] : index) extent([[CON20]] : index) stride([[CON4]] : index) startIdx([[CON1]] : index) {strideInBytes = true}
+// CHECK-NEXT: [[COPYINF2:%.*]] = acc.copyin varPtr([[ARGC]] : memref<10x20xf32>) bounds([[BOUNDS1F]], [[BOUNDS2F]]) -> memref<10x20xf32>
+// CHECK-NEXT: acc.parallel dataOperands([[COPYINF1]], [[COPYINF2]] : memref<10xf32>, memref<10x20xf32>) {
+// CHECK-NEXT: }
+// CHECK: [[BOUNDS1P:%.*]] = acc.bounds lowerbound([[CON4]] : index) upperbound([[CON9]] : index) stride([[CON1]] : index)
+// CHECK-NEXT: [[COPYINPART:%.*]] = acc.copyin varPtr([[ARGA]] : memref<10xf32>) bounds([[BOUNDS1P]]) -> memref<10xf32> {decomposedFrom = 3 : i64}
+// CHECK-NEXT: acc.parallel dataOperands([[COPYINPART]] : memref<10xf32>) {
+// CHECK-NEXT: }
+// CHECK-NEXT: acc.copyout accPtr([[COPYINPART]] : memref<10xf32>) bounds([[BOUNDS1P]]) to varPtr([[ARGA]] : memref<10xf32>) {decomposedFrom = 3 : i64}
+
+// -----
+
+func.func @testunstructuredclauseops(%a: memref<10xf32>) -> () {
+  %copyin = acc.copyin varPtr(%a : memref<10xf32>) -> memref<10xf32> {structured = false}
+  acc.enter_data dataOperands(%copyin : memref<10xf32>)
+
+  %devptr = acc.getdeviceptr varPtr(%a : memref<10xf32>) -> memref<10xf32> {decomposedFrom = 4}
+  acc.exit_data dataOperands(%devptr : memref<10xf32>)
+  acc.copyout accPtr(%devptr : memref<10xf32>) to varPtr(%a : memref<10xf32>) {structured = false}
+
+  return
+}
+
+// CHECK: func.func @testunstructuredclauseops([[ARGA:%.*]]: memref<10xf32>) {
+// CHECK: [[COPYIN:%.*]] = acc.copyin varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32> {structured = false}
+// CHECK-NEXT: acc.enter_data dataOperands([[COPYIN]] : memref<10xf32>)
+// CHECK: [[DEVPTR:%.*]] = acc.getdeviceptr varPtr([[ARGA]] : memref<10xf32>) -> memref<10xf32> {decomposedFrom = 4 : i64}
+// CHECK-NEXT: acc.exit_data dataOperands([[DEVPTR]] : memref<10xf32>)
+// CHECK-NEXT: acc.copyout accPtr([[DEVPTR]] : memref<10xf32>) to varPtr([[ARGA]] : memref<10xf32>) {structured = false}