diff --git a/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir b/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir index 61df6d8e16c34..b9b46c24098c8 100644 --- a/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir +++ b/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir @@ -644,3 +644,14 @@ func.func @_QPsimple_reduction(%arg0: !fir.ref>> } return } + +// ----- + +// CHECK: llvm.func @_QPs +// CHECK: omp.atomic.read %{{.*}} = %{{.*}} : !llvm.ptr>, !llvm.struct<(f32, f32)> + +func.func @_QPs(%arg0: !fir.ref> {fir.bindc_name = "x"}) { + %0 = fir.alloca !fir.complex<4> {bindc_name = "v", uniq_name = "_QFsEv"} + omp.atomic.read %0 = %arg0 : !fir.ref>, !fir.complex<4> + return +} diff --git a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp index a5fdc4e7fd9c0..fb8ad5a4c31f5 100644 --- a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp +++ b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp @@ -77,6 +77,7 @@ struct RegionLessOpWithVarOperandsConversion } convertedOperands.emplace_back(adaptor.getOperands()[idx]); } + rewriter.replaceOpWithNewOp(curOp, resTypes, convertedOperands, curOp->getAttrs()); return success(); @@ -138,6 +139,23 @@ struct RegionLessOpConversion : public ConvertOpToLLVMPattern { } }; +struct AtomicReadOpConversion + : public ConvertOpToLLVMPattern { + using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; + LogicalResult + matchAndRewrite(omp::AtomicReadOp curOp, OpAdaptor adaptor, + ConversionPatternRewriter &rewriter) const override { + TypeConverter *converter = ConvertToLLVMPattern::getTypeConverter(); + Type curElementType = curOp.getElementType(); + auto newOp = rewriter.create( + curOp.getLoc(), TypeRange(), adaptor.getOperands(), curOp->getAttrs()); + TypeAttr typeAttr = TypeAttr::get(converter->convertType(curElementType)); + newOp.setElementTypeAttr(typeAttr); + rewriter.eraseOp(curOp); + return success(); + } +}; + struct ReductionOpConversion : public ConvertOpToLLVMPattern { using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; LogicalResult @@ -213,15 +231,14 @@ void mlir::configureOpenMPToLLVMConversionLegality( void mlir::populateOpenMPToLLVMConversionPatterns(LLVMTypeConverter &converter, RewritePatternSet &patterns) { patterns.add< - ReductionOpConversion, ReductionDeclareOpConversion, - RegionOpConversion, RegionOpConversion, - ReductionOpConversion, RegionOpConversion, - RegionOpConversion, RegionOpConversion, - RegionOpConversion, RegionOpConversion, - RegionOpConversion, RegionOpConversion, - RegionOpConversion, RegionOpConversion, - RegionOpConversion, - RegionLessOpWithVarOperandsConversion, + AtomicReadOpConversion, ReductionOpConversion, + ReductionDeclareOpConversion, RegionOpConversion, + RegionOpConversion, ReductionOpConversion, + RegionOpConversion, RegionOpConversion, + RegionOpConversion, RegionOpConversion, + RegionOpConversion, RegionOpConversion, + RegionOpConversion, RegionOpConversion, + RegionOpConversion, RegionOpConversion, RegionLessOpWithVarOperandsConversion, RegionOpWithVarOperandsConversion, RegionLessOpWithVarOperandsConversion,