[Mlir-commits] [mlir] 6bcb4c4 - [mlir][OpenMP] Added omp.atomic.write lowering to LLVM IR
Shraiysh Vaishay
llvmlistbot at llvm.org
Thu Jan 6 20:32:07 PST 2022
Author: Shraiysh Vaishay
Date: 2022-01-07T10:01:57+05:30
New Revision: 6bcb4c44de0cff8a1d9a465c780c551d4d874db5
URL: https://github.com/llvm/llvm-project/commit/6bcb4c44de0cff8a1d9a465c780c551d4d874db5
DIFF: https://github.com/llvm/llvm-project/commit/6bcb4c44de0cff8a1d9a465c780c551d4d874db5.diff
LOG: [mlir][OpenMP] Added omp.atomic.write lowering to LLVM IR
This patch adds omp.atomic.write lowering to LLVM IR.
Also, changed the syntax to have equal symbol instead of the comma to
make it more intuitive.
Reviewed By: kiranchandramohan, peixin
Differential Revision: https://reviews.llvm.org/D116416
Added:
Modified:
mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
mlir/test/Dialect/OpenMP/invalid.mlir
mlir/test/Dialect/OpenMP/ops.mlir
mlir/test/Target/LLVMIR/openmp-llvm.mlir
Removed:
################################################################################
diff --git a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
index 1f004c6c99507..e919a80221558 100644
--- a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
+++ b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
@@ -1389,7 +1389,7 @@ static ParseResult parseAtomicWriteOp(OpAsmParser &parser,
SmallVector<ClauseType> clauses = {memoryOrderClause, hintClause};
SmallVector<int> segments;
- if (parser.parseOperand(address) || parser.parseComma() ||
+ if (parser.parseOperand(address) || parser.parseEqual() ||
parser.parseOperand(value) ||
parseClauses(parser, result, clauses, segments) ||
parser.parseColonType(addrType) || parser.parseComma() ||
@@ -1402,7 +1402,7 @@ static ParseResult parseAtomicWriteOp(OpAsmParser &parser,
/// Printer for AtomicWriteOp
static void printAtomicWriteOp(OpAsmPrinter &p, AtomicWriteOp op) {
- p << " " << op.address() << ", " << op.value() << " ";
+ p << " " << op.address() << " = " << op.value() << " ";
if (op.memory_order())
p << "memory_order(" << op.memory_order() << ") ";
if (op.hintAttr())
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 7a3eca3e32d14..ad81d780f0901 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -909,6 +909,29 @@ convertOmpAtomicRead(Operation &opInst, llvm::IRBuilderBase &builder,
return success();
}
+/// Converts an omp.atomic.write operation to LLVM IR.
+static LogicalResult
+convertOmpAtomicWrite(Operation &opInst, llvm::IRBuilderBase &builder,
+ LLVM::ModuleTranslation &moduleTranslation) {
+ auto writeOp = cast<omp::AtomicWriteOp>(opInst);
+ llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
+
+ // Set up the source location value for OpenMP runtime.
+ llvm::DISubprogram *subprogram =
+ builder.GetInsertBlock()->getParent()->getSubprogram();
+ const llvm::DILocation *diLoc =
+ moduleTranslation.translateLoc(opInst.getLoc(), subprogram);
+ llvm::OpenMPIRBuilder::LocationDescription ompLoc(builder.saveIP(),
+ llvm::DebugLoc(diLoc));
+ llvm::AtomicOrdering ao = convertAtomicOrdering(writeOp.memory_order());
+ llvm::Value *expr = moduleTranslation.lookupValue(writeOp.value());
+ llvm::Value *dest = moduleTranslation.lookupValue(writeOp.address());
+ llvm::OpenMPIRBuilder::AtomicOpValue x = {dest, /*isSigned=*/false,
+ /*isVolatile=*/false};
+ builder.restoreIP(ompBuilder->createAtomicWrite(ompLoc, x, expr, ao));
+ return success();
+}
+
/// Converts an OpenMP reduction operation using OpenMPIRBuilder. Expects the
/// mapping between reduction variables and their private equivalents to have
/// been stored on the ModuleTranslation stack. Currently only supports
@@ -1033,6 +1056,9 @@ LogicalResult OpenMPDialectLLVMIRTranslationInterface::convertOperation(
.Case([&](omp::AtomicReadOp) {
return convertOmpAtomicRead(*op, builder, moduleTranslation);
})
+ .Case([&](omp::AtomicWriteOp) {
+ return convertOmpAtomicWrite(*op, builder, moduleTranslation);
+ })
.Case([&](omp::SectionsOp) {
return convertOmpSections(*op, builder, moduleTranslation);
})
diff --git a/mlir/test/Dialect/OpenMP/invalid.mlir b/mlir/test/Dialect/OpenMP/invalid.mlir
index 77854266ecf9c..57276c3b5bf3a 100644
--- a/mlir/test/Dialect/OpenMP/invalid.mlir
+++ b/mlir/test/Dialect/OpenMP/invalid.mlir
@@ -555,7 +555,7 @@ func @omp_atomic_read6(%addr : memref<i32>) {
func @omp_atomic_write1(%addr : memref<i32>, %val : i32) {
// expected-error @below {{the hints omp_sync_hint_uncontended and omp_sync_hint_contended cannot be combined}}
- omp.atomic.write %addr, %val hint(contended, uncontended) : memref<i32>, i32
+ omp.atomic.write %addr = %val hint(contended, uncontended) : memref<i32>, i32
return
}
@@ -563,7 +563,7 @@ func @omp_atomic_write1(%addr : memref<i32>, %val : i32) {
func @omp_atomic_write2(%addr : memref<i32>, %val : i32) {
// expected-error @below {{memory-order must not be acq_rel or acquire for atomic writes}}
- omp.atomic.write %addr, %val memory_order(acq_rel) : memref<i32>, i32
+ omp.atomic.write %addr = %val memory_order(acq_rel) : memref<i32>, i32
return
}
@@ -571,7 +571,7 @@ func @omp_atomic_write2(%addr : memref<i32>, %val : i32) {
func @omp_atomic_write3(%addr : memref<i32>, %val : i32) {
// expected-error @below {{memory-order must not be acq_rel or acquire for atomic writes}}
- omp.atomic.write %addr, %val memory_order(acquire) : memref<i32>, i32
+ omp.atomic.write %addr = %val memory_order(acquire) : memref<i32>, i32
return
}
@@ -579,7 +579,7 @@ func @omp_atomic_write3(%addr : memref<i32>, %val : i32) {
func @omp_atomic_write4(%addr : memref<i32>, %val : i32) {
// expected-error @below {{at most one memory_order clause can appear on the omp.atomic.write operation}}
- omp.atomic.write %addr, %val memory_order(release) memory_order(seq_cst) : memref<i32>, i32
+ omp.atomic.write %addr = %val memory_order(release) memory_order(seq_cst) : memref<i32>, i32
return
}
@@ -587,7 +587,7 @@ func @omp_atomic_write4(%addr : memref<i32>, %val : i32) {
func @omp_atomic_write5(%addr : memref<i32>, %val : i32) {
// expected-error @below {{at most one hint clause can appear on the omp.atomic.write operation}}
- omp.atomic.write %addr, %val hint(contended) hint(speculative) : memref<i32>, i32
+ omp.atomic.write %addr = %val hint(contended) hint(speculative) : memref<i32>, i32
return
}
@@ -595,7 +595,7 @@ func @omp_atomic_write5(%addr : memref<i32>, %val : i32) {
func @omp_atomic_write6(%addr : memref<i32>, %val : i32) {
// expected-error @below {{attribute 'memory_order' failed to satisfy constraint: MemoryOrderKind Clause}}
- omp.atomic.write %addr, %val memory_order(xyz) : memref<i32>, i32
+ omp.atomic.write %addr = %val memory_order(xyz) : memref<i32>, i32
return
}
diff --git a/mlir/test/Dialect/OpenMP/ops.mlir b/mlir/test/Dialect/OpenMP/ops.mlir
index 45e9c2e3d6bfc..845237541d9dc 100644
--- a/mlir/test/Dialect/OpenMP/ops.mlir
+++ b/mlir/test/Dialect/OpenMP/ops.mlir
@@ -511,16 +511,16 @@ func @omp_atomic_read(%addr : memref<i32>) {
// CHECK-LABEL: omp_atomic_write
// CHECK-SAME: (%[[ADDR:.*]]: memref<i32>, %[[VAL:.*]]: i32)
func @omp_atomic_write(%addr : memref<i32>, %val : i32) {
- // CHECK: omp.atomic.write %[[ADDR]], %[[VAL]] : memref<i32>, i32
- omp.atomic.write %addr, %val : memref<i32>, i32
- // CHECK: omp.atomic.write %[[ADDR]], %[[VAL]] memory_order(seq_cst) : memref<i32>, i32
- omp.atomic.write %addr, %val memory_order(seq_cst) : memref<i32>, i32
- // CHECK: omp.atomic.write %[[ADDR]], %[[VAL]] memory_order(release) : memref<i32>, i32
- omp.atomic.write %addr, %val memory_order(release) : memref<i32>, i32
- // CHECK: omp.atomic.write %[[ADDR]], %[[VAL]] memory_order(relaxed) : memref<i32>, i32
- omp.atomic.write %addr, %val memory_order(relaxed) : memref<i32>, i32
- // CHECK: omp.atomic.write %[[ADDR]], %[[VAL]] hint(uncontended, speculative) : memref<i32>, i32
- omp.atomic.write %addr, %val hint(speculative, uncontended) : memref<i32>, i32
+ // CHECK: omp.atomic.write %[[ADDR]] = %[[VAL]] : memref<i32>, i32
+ omp.atomic.write %addr = %val : memref<i32>, i32
+ // CHECK: omp.atomic.write %[[ADDR]] = %[[VAL]] memory_order(seq_cst) : memref<i32>, i32
+ omp.atomic.write %addr = %val memory_order(seq_cst) : memref<i32>, i32
+ // CHECK: omp.atomic.write %[[ADDR]] = %[[VAL]] memory_order(release) : memref<i32>, i32
+ omp.atomic.write %addr = %val memory_order(release) : memref<i32>, i32
+ // CHECK: omp.atomic.write %[[ADDR]] = %[[VAL]] memory_order(relaxed) : memref<i32>, i32
+ omp.atomic.write %addr = %val memory_order(relaxed) : memref<i32>, i32
+ // CHECK: omp.atomic.write %[[ADDR]] = %[[VAL]] hint(uncontended, speculative) : memref<i32>, i32
+ omp.atomic.write %addr = %val hint(speculative, uncontended) : memref<i32>, i32
return
}
diff --git a/mlir/test/Target/LLVMIR/openmp-llvm.mlir b/mlir/test/Target/LLVMIR/openmp-llvm.mlir
index 03c4307310cb6..bcb998e826bbd 100644
--- a/mlir/test/Target/LLVMIR/openmp-llvm.mlir
+++ b/mlir/test/Target/LLVMIR/openmp-llvm.mlir
@@ -739,6 +739,24 @@ llvm.func @omp_atomic_read(%arg0 : !llvm.ptr<i32>) -> () {
// -----
+// CHECK-LABEL: @omp_atomic_write
+// CHECK-SAME: (i32* %[[x:.*]], i32 %[[expr:.*]])
+llvm.func @omp_atomic_write(%x: !llvm.ptr<i32>, %expr: i32) -> () {
+ // CHECK: store atomic i32 %[[expr]], i32* %[[x]] monotonic, align 4
+ omp.atomic.write %x = %expr : !llvm.ptr<i32>, i32
+ // CHECK: store atomic i32 %[[expr]], i32* %[[x]] seq_cst, align 4
+ // CHECK: call void @__kmpc_flush(%struct.ident_t* @{{.*}})
+ omp.atomic.write %x = %expr memory_order(seq_cst) : !llvm.ptr<i32>, i32
+ // CHECK: store atomic i32 %[[expr]], i32* %[[x]] release, align 4
+ // CHECK: call void @__kmpc_flush(%struct.ident_t* @{{.*}})
+ omp.atomic.write %x = %expr memory_order(release) : !llvm.ptr<i32>, i32
+ // CHECK: store atomic i32 %[[expr]], i32* %[[x]] monotonic, align 4
+ omp.atomic.write %x = %expr memory_order(relaxed) : !llvm.ptr<i32>, i32
+ llvm.return
+}
+
+// -----
+
// CHECK-LABEL: @omp_sections_empty
llvm.func @omp_sections_empty() -> () {
omp.sections {
More information about the Mlir-commits
mailing list