TIFitis updated this revision to Diff 489345.
TIFitis marked 7 inline comments as done.
TIFitis added a comment.
Added verifiers, removed use of magic constants and addressed other reviewer
comments.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D131915/new/
https://reviews.llvm.org/D131915
Files:
mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
mlir/lib/Dialect/OpenMP/CMakeLists.txt
mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
mlir/test/Dialect/OpenMP/ops.mlir
Index: mlir/test/Dialect/OpenMP/ops.mlir
===================================================================
--- mlir/test/Dialect/OpenMP/ops.mlir
+++ mlir/test/Dialect/OpenMP/ops.mlir
@@ -451,6 +451,32 @@
return
}
+// CHECK-LABEL: omp_target_data
+func.func @omp_target_data (%if_cond : i1, %device : si32, %device_ptr: memref<i32>, %device_addr: memref<?xi32>, %map1: memref<?xi32>, %map2: memref<?xi32>) -> () {
+ // CHECK: %[[VAL_0:.*]] = arith.constant 0 : i64
+ %c0_i64 = arith.constant 0 : i64
+
+ // CHECK: %[[VAL_1:.*]] = arith.constant 6 : i64
+ %c6_i64 = arith.constant 6 : i64
+
+ // CHECK: omp.target_data if(%[[VAL_2:.*]] : i1) device(%[[VAL_3:.*]] : si32) map((%[[VAL_1]] -> always , from : %[[VAL_4:.*]] : memref<?xi32>))
+ omp.target_data if(%if_cond : i1) device(%device : si32) map((%c6_i64 -> always , from : %map1 : memref<?xi32>)){}
+
+ // CHECK: omp.target_data use_device_ptr(%[[VAL_5:.*]] : memref<i32>) use_device_addr(%[[VAL_6:.*]] : memref<?xi32>) map((%[[VAL_1]] -> always , from : %[[VAL_4]] : memref<?xi32>))
+ omp.target_data use_device_ptr(%device_ptr : memref<i32>) use_device_addr(%device_addr : memref<?xi32>) map((%c6_i64 -> always , from : %map1 : memref<?xi32>)){}
+
+ // CHECK: omp.target_data map((%[[VAL_1]] -> always , from : %[[VAL_4]] : memref<?xi32>), (%[[VAL_0]] -> none , alloc : %[[VAL_7:.*]] : memref<?xi32>))
+ omp.target_data map((%c6_i64 -> always , from : %map1 : memref<?xi32>), (%c0_i64 -> none , alloc : %map2 : memref<?xi32>)){}
+
+ // CHECK: omp.target_enter_data if(%[[VAL_2]] : i1) device(%[[VAL_3]] : si32) nowait map((%[[VAL_0]] -> none , alloc : %[[VAL_7]] : memref<?xi32>))
+ omp.target_enter_data if(%if_cond : i1) device(%device : si32) nowait map((%c0_i64 -> none , alloc : %map2 : memref<?xi32>))
+
+ // CHECK: omp.target_exit_data if(%[[VAL_2]] : i1) device(%[[VAL_3]] : si32) nowait map((%[[VAL_0]] -> none , release : %[[VAL_7]] : memref<?xi32>))
+ omp.target_exit_data if(%if_cond : i1) device(%device : si32) nowait map((%c0_i64 -> none , release : %map2 : memref<?xi32>))
+
+ return
+}
+
// CHECK-LABEL: omp_target_pretty
func.func @omp_target_pretty(%if_cond : i1, %device : si32, %num_threads : i32) -> () {
// CHECK: omp.target if({{.*}}) device({{.*}})
Index: mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
===================================================================
--- mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
+++ mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
@@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
+#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
#include "mlir/IR/Attributes.h"
#include "mlir/IR/DialectImplementation.h"
@@ -22,7 +23,9 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/TypeSwitch.h"
+#include "llvm/Frontend/OpenMP/OMPConstants.h"
#include <cstddef>
+#include <numeric>
#include "mlir/Dialect/OpenMP/OpenMPOpsDialect.cpp.inc"
#include "mlir/Dialect/OpenMP/OpenMPOpsEnums.cpp.inc"
@@ -536,6 +539,159 @@
return success();
}
+//===----------------------------------------------------------------------===//
+// Parser, printer and verifier for Target Data
+//===----------------------------------------------------------------------===//
+static ParseResult parseMapClause(
+ OpAsmParser &parser,
+ SmallVector<SmallVector<OpAsmParser::UnresolvedOperand>> &map_operands,
+ SmallVector<SmallVector<Type>> &map_operand_types) {
+ StringRef mapTypeMod, mapType;
+ OpAsmParser::UnresolvedOperand arg1, arg2;
+ Type arg2Type;
+ auto parseKeyword = [&]() -> ParseResult {
+ if (parser.parseLParen() || parser.parseOperand(arg1) ||
+ parser.parseArrow() || parser.parseKeyword(&mapTypeMod) ||
+ parser.parseComma() || parser.parseKeyword(&mapType) ||
+ parser.parseColon() || parser.parseOperand(arg2) ||
+ parser.parseColon() || parser.parseType(arg2Type) ||
+ parser.parseRParen())
+ return failure();
+ map_operands.push_back({arg1, arg2});
+ map_operand_types.push_back({parser.getBuilder().getI64Type(), arg2Type});
+ return success();
+ };
+ if (parser.parseCommaSeparatedList(parseKeyword))
+ return failure();
+ return success();
+}
+
+static void printMapClause(OpAsmPrinter &p, Operation *op,
+ OperandRangeRange map_operands,
+ TypeRangeRange map_operand_types) {
+
+ // Helper function to get bitwise AND of `value` and 'flag'
+ auto bitAnd = [](int64_t value,
+ llvm::omp::OpenMPOffloadMappingFlags flag) -> bool {
+ return value &
+ static_cast<
+ std::underlying_type_t<llvm::omp::OpenMPOffloadMappingFlags>>(
+ flag);
+ };
+
+ for (const auto &mapOp : map_operands) {
+ int64_t mapTypeBits = 0x00;
+ if (auto constOp =
+ mlir::dyn_cast<mlir::arith::ConstantOp>(mapOp[0].getDefiningOp()))
+ mapTypeBits = constOp.getValue()
+ .cast<mlir::IntegerAttr>()
+ .getValue()
+ .getSExtValue();
+ else if (auto constOp = mlir::dyn_cast<mlir::LLVM::ConstantOp>(
+ mapOp[0].getDefiningOp()))
+ mapTypeBits = constOp.getValue().dyn_cast<mlir::IntegerAttr>().getInt();
+
+ bool always = bitAnd(mapTypeBits,
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_ALWAYS);
+ bool close = bitAnd(mapTypeBits,
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_CLOSE);
+ bool present = bitAnd(
+ mapTypeBits, llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_PRESENT);
+
+ bool to =
+ bitAnd(mapTypeBits, llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TO);
+ bool from =
+ bitAnd(mapTypeBits, llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_FROM);
+ bool del = bitAnd(mapTypeBits,
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_DELETE);
+
+ std::string typeModStr, typeStr;
+ llvm::raw_string_ostream typeMod(typeModStr), type(typeStr);
+ if (always)
+ typeMod << "always ";
+ if (close)
+ typeMod << "close ";
+ if (present)
+ typeMod << "present ";
+ if (typeMod.str().empty())
+ typeMod << "none ";
+
+ if (to)
+ type << "to ";
+ if (from)
+ type << "from ";
+ if (del)
+ type << "delete ";
+ if (type.str().empty())
+ type << (isa<ExitDataOp>(op) ? "release " : "alloc ");
+
+ p << '(' << mapOp[0] << " -> " << typeMod.str() << ", " << type.str()
+ << ": " << mapOp[1] << " : " << mapOp[1].getType() << ')';
+ if (mapOp != map_operands.back())
+ p << ", ";
+ }
+}
+
+static LogicalResult verifyMapClause(Operation *op,
+ OperandRangeRange mapOperands) {
+ // Helper function to get bitwise AND of `value` and 'flag'
+ auto bitAnd = [](int64_t value,
+ llvm::omp::OpenMPOffloadMappingFlags flag) -> bool {
+ return value &
+ static_cast<
+ std::underlying_type_t<llvm::omp::OpenMPOffloadMappingFlags>>(
+ flag);
+ };
+
+ for (const auto &mapOp : mapOperands) {
+ if (mapOp.size() != 2)
+ return failure();
+ if (!mapOp[0].getType().isInteger(64))
+ return failure();
+
+ int64_t mapTypeBits = 0x00;
+ if (auto constOp =
+ mlir::dyn_cast<mlir::arith::ConstantOp>(mapOp[0].getDefiningOp()))
+ mapTypeBits = constOp.getValue()
+ .cast<mlir::IntegerAttr>()
+ .getValue()
+ .getSExtValue();
+ else if (auto constOp = mlir::dyn_cast<mlir::LLVM::ConstantOp>(
+ mapOp[0].getDefiningOp()))
+ mapTypeBits = constOp.getValue().dyn_cast<mlir::IntegerAttr>().getInt();
+
+ bool to =
+ bitAnd(mapTypeBits, llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TO);
+ bool from =
+ bitAnd(mapTypeBits, llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_FROM);
+ bool del = bitAnd(mapTypeBits,
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_DELETE);
+
+ if (isa<DataOp>(op) && del)
+ return failure();
+
+ if (isa<EnterDataOp>(op) && (from || del))
+ return failure();
+
+ if (isa<ExitDataOp>(op) && to)
+ return failure();
+ }
+
+ return success();
+}
+
+LogicalResult DataOp::verify() {
+ return verifyMapClause(*this, getMapOperands());
+}
+
+LogicalResult EnterDataOp::verify() {
+ return verifyMapClause(*this, getMapOperands());
+}
+
+LogicalResult ExitDataOp::verify() {
+ return verifyMapClause(*this, getMapOperands());
+}
+
//===----------------------------------------------------------------------===//
// ParallelOp
//===----------------------------------------------------------------------===//
Index: mlir/lib/Dialect/OpenMP/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/OpenMP/CMakeLists.txt
+++ mlir/lib/Dialect/OpenMP/CMakeLists.txt
@@ -12,4 +12,5 @@
LINK_LIBS PUBLIC
MLIRIR
MLIRLLVMDialect
+ MLIRArithDialect
)
Index: mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
===================================================================
--- mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
+++ mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
@@ -786,6 +786,157 @@
let assemblyFormat = "attr-dict";
}
+//===---------------------------------------------------------------------===//
+// 2.12.2 target data Construct
+//===---------------------------------------------------------------------===//
+
+def Target_DataOp: OpenMP_Op<"target_data", [AttrSizedOperandSegments]>{
+ let summary = "target data construct";
+ let description = [{
+ Map variables to a device data environment for the extent of the region.
+
+ The omp target data directive maps variables to a device data
+ environment, and defines the lexical scope of the data environment
+ that is created. The omp target data directive can reduce data copies
+ to and from the offloading device when multiple target regions are using
+ the same data.
+
+ The optional $if_expr parameter specifies a boolean result of a
+ conditional check. If this value is 1 or is not provided then the target
+ region runs on a device, if it is 0 then the target region is executed
+ on the host device.
+
+ The optional $device parameter specifies the device number for the target
+ region.
+
+ The optional $use_device_ptr specifies the device pointers to the
+ corresponding list items in the device data environment.
+
+ The optional $use_device_addr specifies the address of the objects in the
+ device data enviornment.
+
+ The $map_operands specifies operands in map clause along with it's type and modifiers.
+
+ The $map_operand_segments specifies the segment sizes for $map_operands.
+
+ TODO: depend clause and map_type_modifier values iterator and mapper.
+ }];
+
+ let arguments = (ins Optional<I1>:$if_expr,
+ Optional<AnyInteger>:$device,
+ Variadic<AnyType>:$use_device_ptr,
+ Variadic<AnyType>:$use_device_addr,
+ VariadicOfVariadic<AnyType, "map_operand_segments">:$map_operands,
+ DenseI32ArrayAttr:$map_operand_segments);
+
+ let regions = (region AnyRegion:$region);
+
+ let assemblyFormat = [{
+ oilist(`if` `(` $if_expr `:` type($if_expr) `)`
+ | `device` `(` $device `:` type($device) `)`
+ | `use_device_ptr` `(` $use_device_ptr `:` type($use_device_ptr) `)`
+ | `use_device_addr` `(` $use_device_addr `:` type($use_device_addr) `)`
+ | `map` `(` custom<MapClause>($map_operands, type($map_operands)) `)`)
+ $region attr-dict
+ }];
+
+ let hasVerifier = 1;
+}
+
+//===---------------------------------------------------------------------===//
+// 2.12.3 target enter data Construct
+//===---------------------------------------------------------------------===//
+
+def Target_EnterDataOp: OpenMP_Op<"target_enter_data",
+ [AttrSizedOperandSegments]>{
+ let summary = "target enter data construct";
+ let description = [{
+ The target enter data directive specifies that variables are mapped to
+ a device data environment. The target enter data directive is a
+ stand-alone directive.
+
+ The optional $if_expr parameter specifies a boolean result of a
+ conditional check. If this value is 1 or is not provided then the target
+ region runs on a device, if it is 0 then the target region is executed on
+ the host device.
+
+ The optional $device parameter specifies the device number for the
+ target region.
+
+ The optional $nowait eliminates the implicit barrier so the parent task
+ can make progress even if the target task is not yet completed.
+
+ The $map_operands specifies operands in map clause along with it's type and modifiers.
+
+ The $map_operand_segments specifies the segment sizes for $map_operands.
+
+ TODO: depend clause and map_type_modifier values iterator and mapper.
+ }];
+
+ let arguments = (ins Optional<I1>:$if_expr,
+ Optional<AnyInteger>:$device,
+ UnitAttr:$nowait,
+ VariadicOfVariadic<AnyType, "map_operand_segments">:$map_operands,
+ DenseI32ArrayAttr:$map_operand_segments);
+
+ let assemblyFormat = [{
+ oilist(`if` `(` $if_expr `:` type($if_expr) `)`
+ | `device` `(` $device `:` type($device) `)`
+ | `nowait` $nowait
+ | `map` `(` custom<MapClause>($map_operands, type($map_operands)) `)`)
+ attr-dict
+ }];
+
+ let hasVerifier = 1;
+}
+
+//===---------------------------------------------------------------------===//
+// 2.12.4 target exit data Construct
+//===---------------------------------------------------------------------===//
+
+def Target_ExitDataOp: OpenMP_Op<"target_exit_data",
+ [AttrSizedOperandSegments]>{
+ let summary = "target exit data construct";
+ let description = [{
+ The target exit data directive specifies that variables are mapped to a
+ device data environment. The target exit data directive is
+ a stand-alone directive.
+
+ The optional $if_expr parameter specifies a boolean result of a
+ conditional check. If this value is 1 or is not provided then the target
+ region runs on a device, if it is 0 then the target region is executed
+ on the host device.
+
+ The optional $device parameter specifies the device number for the
+ target region.
+
+ The optional $nowait eliminates the implicit barrier so the parent
+ task can make progress even if the target task is not yet completed.
+
+ The $map_operands specifies operands in map clause along with it's type and modifiers.
+
+ The $map_operand_segments specifies the segment sizes for $map_operands.
+
+ TODO: depend clause and map_type_modifier values iterator and mapper.
+ }];
+
+ let arguments = (ins Optional<I1>:$if_expr,
+ Optional<AnyInteger>:$device,
+ UnitAttr:$nowait,
+ VariadicOfVariadic<AnyType, "map_operand_segments">:$map_operands,
+ DenseI32ArrayAttr:$map_operand_segments);
+
+ let assemblyFormat = [{
+ oilist(`if` `(` $if_expr `:` type($if_expr) `)`
+ | `device` `(` $device `:` type($device) `)`
+ | `nowait` $nowait
+ | `map` `(` custom<MapClause>($map_operands, type($map_operands)) `)`)
+ attr-dict
+ }];
+
+ let hasVerifier = 1;
+}
+
//===----------------------------------------------------------------------===//
// 2.13.7 flush Construct
//===----------------------------------------------------------------------===//
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
