diff --git a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp index a5c087e452414..ecebf24e5e746 100644 --- a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp +++ b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp @@ -16,6 +16,7 @@ #include "flang/Lower/PFTBuilder.h" #include "flang/Lower/SymbolMap.h" #include "flang/Optimizer/Builder/Todo.h" +#include "flang/Optimizer/HLFIR/HLFIROps.h" #include "flang/Semantics/tools.h" #include "mlir/Dialect/OpenMP/OpenMPDialect.h" @@ -369,9 +370,51 @@ void DataSharingProcessor::doPrivatize(const Fortran::semantics::Symbol *sym) { isFirstPrivate ? mlir::omp::DataSharingClauseType::FirstPrivate : mlir::omp::DataSharingClauseType::Private); fir::ExtendedValue symExV = converter.getSymbolExtendedValue(*sym); - symTable->pushScope(); + auto addSymbol = [&](mlir::Region ®ion, unsigned argIdx, + bool force = false) { + symExV.match( + [&](const fir::ArrayBoxValue &box) { + auto idxTy = firOpBuilder.getIndexType(); + llvm::SmallVector extents; + llvm::SmallVector lBounds; + + for (unsigned dim = 0; dim < box.getExtents().size(); ++dim) { + mlir::Value dimVal = + firOpBuilder.createIntegerConstant(symLoc, idxTy, dim); + fir::BoxDimsOp dimInfo = firOpBuilder.create( + symLoc, idxTy, idxTy, idxTy, region.getArgument(argIdx), + dimVal); + extents.push_back(dimInfo.getExtent()); + lBounds.push_back(dimInfo.getLowerBound()); + } + + symTable->addSymbol(*sym, + fir::ArrayBoxValue(region.getArgument(argIdx), + extents, lBounds), + force); + }, + [&](const fir::CharBoxValue &box) { + fir::BoxCharType boxCharType = symType.cast(); + mlir::Type charRefType = + firOpBuilder.getRefType(boxCharType.getEleTy()); + + fir::UnboxCharOp unboxedArg = firOpBuilder.create( + symLoc, charRefType, firOpBuilder.getCharacterLengthType(), + region.getArgument(argIdx)); + hlfir::DeclareOp localVar = firOpBuilder.create( + symLoc, unboxedArg.getResult(0), converter.mangleName(*sym), + nullptr, + llvm::SmallVector{unboxedArg.getResult(1)}); + symTable->addVariableDefinition(*sym, localVar, force); + }, + [&](const auto &box) { + symTable->addSymbol( + *sym, fir::substBase(box, region.getArgument(argIdx)), force); + }); + }; + // Populate the `alloc` region. { mlir::Region &allocRegion = result.getAllocRegion(); @@ -379,8 +422,8 @@ void DataSharingProcessor::doPrivatize(const Fortran::semantics::Symbol *sym) { &allocRegion, /*insertPt=*/{}, symType, symLoc); firOpBuilder.setInsertionPointToEnd(allocEntryBlock); - symTable->addSymbol(*sym, - fir::substBase(symExV, allocRegion.getArgument(0))); + + addSymbol(allocRegion, 0); symTable->pushScope(); cloneSymbol(sym); firOpBuilder.create( @@ -397,12 +440,10 @@ void DataSharingProcessor::doPrivatize(const Fortran::semantics::Symbol *sym) { mlir::Block *copyEntryBlock = firOpBuilder.createBlock( ©Region, /*insertPt=*/{}, {symType, symType}, {symLoc, symLoc}); firOpBuilder.setInsertionPointToEnd(copyEntryBlock); - symTable->addSymbol(*sym, - fir::substBase(symExV, copyRegion.getArgument(0)), - /*force=*/true); + + addSymbol(copyRegion, 0, true); symTable->pushScope(); - symTable->addSymbol(*sym, - fir::substBase(symExV, copyRegion.getArgument(1))); + addSymbol(copyRegion, 1); auto ip = firOpBuilder.saveInsertionPoint(); copyFirstPrivateSymbol(sym, &ip); diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp index 7b384d84ad632..08bb7d73806bf 100644 --- a/flang/lib/Lower/OpenMP/OpenMP.cpp +++ b/flang/lib/Lower/OpenMP/OpenMP.cpp @@ -654,20 +654,31 @@ genParallelOp(Fortran::lower::AbstractConverter &converter, llvm::transform(privateVars, std::back_inserter(privateVarLocs), [](mlir::Value v) { return v.getLoc(); }); - converter.getFirOpBuilder().createBlock(®ion, /*insertPt=*/{}, - privateVarTypes, privateVarLocs); + fir::FirOpBuilder &builder = converter.getFirOpBuilder(); + builder.createBlock(®ion, /*insertPt=*/{}, privateVarTypes, + privateVarLocs); llvm::SmallVector allSymbols = reductionSymbols; allSymbols.append(delayedPrivatizationInfo.symbols); - for (auto [arg, prv] : llvm::zip_equal(allSymbols, region.getArguments())) { - converter.bindSymbol(*arg, prv); - } + for (auto [arg, prv] : llvm::zip_equal(allSymbols, region.getArguments())) + if (fir::BoxCharType boxCharTy = + prv.getType().dyn_cast()) { + mlir::Type charRefType = builder.getRefType(boxCharTy.getEleTy()); + + fir::UnboxCharOp unboxedArg = builder.create( + builder.getUnknownLoc(), charRefType, + builder.getCharacterLengthType(), prv); + + fir::CharBoxValue newBox(unboxedArg.getResult(0), + unboxedArg.getResult(1)); + converter.bindSymbol(*arg, newBox); + } else + converter.bindSymbol(*arg, prv); return allSymbols; }; - // TODO Merge with the reduction CB. genInfo.setGenRegionEntryCb(genRegionEntryCB).setDataSharingProcessor(&dsp); llvm::SmallVector privatizers( diff --git a/flang/lib/Optimizer/Builder/HLFIRTools.cpp b/flang/lib/Optimizer/Builder/HLFIRTools.cpp index c7a550814e1d5..3651f53c8fdc5 100644 --- a/flang/lib/Optimizer/Builder/HLFIRTools.cpp +++ b/flang/lib/Optimizer/Builder/HLFIRTools.cpp @@ -897,6 +897,7 @@ translateVariableToExtendedValue(mlir::Location loc, fir::FirOpBuilder &builder, return fir::CharArrayBoxValue{ base, genCharacterVariableLength(loc, builder, variable), extents, nonDefaultLbounds}; + return fir::ArrayBoxValue{base, extents, nonDefaultLbounds}; } diff --git a/flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90 b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90 new file mode 100644 index 0000000000000..47e163014fe86 --- /dev/null +++ b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90 @@ -0,0 +1,67 @@ +! Test delayed privatization for allocatable arrays. + +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: -o - %s 2>&1 | FileCheck %s +! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\ +! RUN: FileCheck %s + +subroutine delayed_privatization_private(var1, l1) + implicit none + integer(8):: l1 + integer, allocatable, dimension(:) :: var1 + +!$omp parallel firstprivate(var1) + var1(l1 + 1) = 10 +!$omp end parallel +end subroutine + +! CHECK-LABEL: omp.private {type = firstprivate} +! CHECK-SAME: @[[PRIVATIZER_SYM:.*]] : [[TYPE:!fir.ref>>>]] alloc { + +! CHECK-NEXT: ^bb0(%[[PRIV_ARG:.*]]: [[TYPE]]): +! CHECK-NEXT: %[[PRIV_ALLOC:.*]] = fir.alloca !fir.box>> {bindc_name = "var1", pinned, uniq_name = "_QFdelayed_privatization_privateEvar1"} + +! CHECK-NEXT: %[[PRIV_ARG_VAL:.*]] = fir.load %[[PRIV_ARG]] +! CHECK-NEXT: %[[PRIV_ARG_BOX:.*]] = fir.box_addr %[[PRIV_ARG_VAL]] +! CHECK-NEXT: %[[PRIV_ARG_ADDR:.*]] = fir.convert %[[PRIV_ARG_BOX]] +! CHECK-NEXT: %[[C0:.*]] = arith.constant 0 : i64 +! CHECK-NEXT: %[[ALLOC_COND:.*]] = arith.cmpi ne, %[[PRIV_ARG_ADDR]], %[[C0]] : i64 + +! CHECK-NEXT: fir.if %[[ALLOC_COND]] { +! CHECK-NEXT: %[[PRIV_ARG_VAL:.*]] = fir.load %[[PRIV_ARG]] : [[TYPE]] +! CHECK-NEXT: %[[C0:.*]] = arith.constant 0 : index +! CHECK-NEXT: %[[DIMS:.*]]:3 = fir.box_dims %[[PRIV_ARG_VAL]], %[[C0]] +! CHECK-NEXT: fir.box_addr %[[PRIV_ARG_VAL]] +! CHECK-NEXT: %[[C0_2:.*]] = arith.constant 0 : index +! CHECK-NEXT: %[[CMP:.*]] = arith.cmpi sgt, %[[DIMS]]#1, %[[C0_2]] : index +! CHECK-NEXT: %[[SELECT:.*]] = arith.select %[[CMP]], %[[DIMS]]#1, %[[C0_2]] : index +! CHECK-NEXT: %[[MEM:.*]] = fir.allocmem !fir.array, %[[SELECT]] +! CHECK-NEXT: %[[SHAPE_SHIFT:.*]] = fir.shape_shift %[[DIMS]]#0, %[[SELECT]] : (index, index) -> !fir.shapeshift<1> +! CHECK-NEXT: %[[EMBOX:.*]] = fir.embox %[[MEM]](%[[SHAPE_SHIFT]]) +! CHECK-NEXT: fir.store %[[EMBOX]] to %[[PRIV_ALLOC]] +! CHECK-NEXT: } else { +! CHECK-NEXT: %[[ZEROS:.*]] = fir.zero_bits +! CHECK-NEXT: %[[C0_3:.*]] = arith.constant 0 : index +! CHECK-NEXT: %[[SHAPE:.*]] = fir.shape %[[C0_3]] : (index) -> !fir.shape<1> +! CHECK-NEXT: %[[EMBOX_2:.*]] = fir.embox %[[ZEROS]](%[[SHAPE]]) +! CHECK-NEXT: fir.store %[[EMBOX_2]] to %[[PRIV_ALLOC]] +! CHECK-NEXT: } + +! CHECK-NEXT: hlfir.declare +! CHECK-NEXT: omp.yield + +! CHECK-NEXT: } copy { +! CHECK-NEXT: ^bb0(%[[PRIV_ORIG_ARG:.*]]: [[TYPE]], %[[PRIV_PRIV_ARG:.*]]: [[TYPE]]): +! CHECK-NEXT: %[[PRIV_BASE_VAL:.*]] = fir.load %[[PRIV_PRIV_ARG]] +! CHECK-NEXT: %[[PRIV_BASE_BOX:.*]] = fir.box_addr %[[PRIV_BASE_VAL]] +! CHECK-NEXT: %[[PRIV_BASE_ADDR:.*]] = fir.convert %[[PRIV_BASE_BOX]] +! CHECK-NEXT: %[[C0:.*]] = arith.constant 0 : i64 +! CHECK-NEXT: %[[COPY_COND:.*]] = arith.cmpi ne, %[[PRIV_BASE_ADDR]], %[[C0]] : i64 + + +! CHECK-NEXT: fir.if %[[COPY_COND]] { +! CHECK-NEXT: %[[PRIV_ORIG_ARG_VAL:.*]] = fir.load %[[PRIV_ORIG_ARG]] +! CHECK-NEXT: hlfir.assign %[[PRIV_ORIG_ARG_VAL]] to %[[PRIV_BASE_VAL]] temporary_lhs +! CHECK-NEXT: } +! CHECK-NEXT: omp.yield +! CHECK-NEXT: } diff --git a/flang/test/Lower/OpenMP/delayed-privatization-array.f90 b/flang/test/Lower/OpenMP/delayed-privatization-array.f90 new file mode 100644 index 0000000000000..f2de4edc24ce4 --- /dev/null +++ b/flang/test/Lower/OpenMP/delayed-privatization-array.f90 @@ -0,0 +1,75 @@ +! Test delayed privatization for arrays. + +! RUN: split-file %s %t + +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: -o - %t/one_dim_array.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM +! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - \ +! RUN: %t/one_dim_array.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM + +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: -o - %t/two_dim_array.f90 2>&1 | FileCheck %s --check-prefix=TWO_DIM +! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/two_dim_array.f90 2>&1 |\ +! RUN: FileCheck %s --check-prefix=TWO_DIM + +!--- one_dim_array.f90 +subroutine delayed_privatization_private(var1, l1, u1) + implicit none + integer(8):: l1, u1 + integer, dimension(l1:u1) :: var1 + +!$omp parallel firstprivate(var1) + var1(l1 + 1) = 10 +!$omp end parallel +end subroutine + +! ONE_DIM-LABEL: omp.private {type = firstprivate} +! ONE_DIM-SAME: @[[PRIVATIZER_SYM:.*]] : [[TYPE:!fir.box>]] alloc { + +! ONE_DIM-NEXT: ^bb0(%[[PRIV_ARG:.*]]: [[TYPE]]): + +! ONE_DIM-NEXT: %[[C0:.*]] = arith.constant 0 : index +! ONE_DIM-NEXT: %[[DIMS:.*]]:3 = fir.box_dims %[[PRIV_ARG]], %[[C0]] : ([[TYPE]], index) -> (index, index, index) +! ONE_DIM-NEXT: %[[PRIV_ALLOCA:.*]] = fir.alloca !fir.array<{{\?}}xi32>, %[[DIMS]]#1 {bindc_name = "var1", pinned, uniq_name = "_QFdelayed_privatization_privateEvar1"} +! ONE_DIM-NEXT: %[[SHAPE_SHIFT:.*]] = fir.shape_shift %[[DIMS]]#0, %[[DIMS]]#1 : (index, index) -> !fir.shapeshift<1> +! ONE_DIM-NEXT: %[[PRIV_DECL:.*]]:2 = hlfir.declare %[[PRIV_ALLOCA]](%[[SHAPE_SHIFT]]) {uniq_name = "_QFdelayed_privatization_privateEvar1"} +! ONE_DIM-NEXT: omp.yield(%[[PRIV_DECL]]#0 : [[TYPE]]) + +! ONE_DIM-NEXT: } copy { +! ONE_DIM-NEXT: ^bb0(%[[PRIV_ORIG_ARG:.*]]: [[TYPE]], %[[PRIV_PRIV_ARG:.*]]: [[TYPE]]): +! ONE_DIM: hlfir.assign %[[PRIV_ORIG_ARG]] to %[[PRIV_PRIV_ARG]] temporary_lhs +! ONE_DIM-NEXT: omp.yield(%[[PRIV_PRIV_ARG]] : [[TYPE]]) +! ONE_DIM-NEXT: } + +!--- two_dim_array.f90 +subroutine delayed_privatization_private(var1, l1, u1, l2, u2) + implicit none + integer(8):: l1, u1, l2, u2 + integer, dimension(l1:u1, l2:u2) :: var1 + +!$omp parallel firstprivate(var1) + var1(l1 + 1, u2) = 10 +!$omp end parallel +end subroutine + +! TWO_DIM-LABEL: omp.private {type = firstprivate} +! TWO_DIM-SAME: @[[PRIVATIZER_SYM:.*]] : [[TYPE:!fir.box>]] alloc { + +! TWO_DIM-NEXT: ^bb0(%[[PRIV_ARG:.*]]: [[TYPE]]): +! TWO_DIM-NEXT: %[[C0:.*]] = arith.constant 0 : index +! TWO_DIM-NEXT: %[[DIMS0:.*]]:3 = fir.box_dims %[[PRIV_ARG]], %[[C0]] : ([[TYPE]], index) -> (index, index, index) + +! TWO_DIM-NEXT: %[[C1:.*]] = arith.constant 1 : index +! TWO_DIM-NEXT: %[[DIMS1:.*]]:3 = fir.box_dims %[[PRIV_ARG]], %[[C1]] : ([[TYPE]], index) -> (index, index, index) + +! TWO_DIM-NEXT: %[[PRIV_ALLOCA:.*]] = fir.alloca !fir.array<{{\?}}x{{\?}}xi32>, %[[DIMS0]]#1, %[[DIMS1]]#1 {bindc_name = "var1", pinned, uniq_name = "_QFdelayed_privatization_privateEvar1"} +! TWO_DIM-NEXT: %[[SHAPE_SHIFT:.*]] = fir.shape_shift %[[DIMS0]]#0, %[[DIMS0]]#1, %[[DIMS1]]#0, %[[DIMS1]]#1 : (index, index, index, index) -> !fir.shapeshift<2> + +! TWO_DIM-NEXT: %[[PRIV_DECL:.*]]:2 = hlfir.declare %[[PRIV_ALLOCA]](%[[SHAPE_SHIFT]]) {uniq_name = "_QFdelayed_privatization_privateEvar1"} +! TWO_DIM-NEXT: omp.yield(%[[PRIV_DECL]]#0 : [[TYPE]]) + +! TWO_DIM-NEXT: } copy { +! TWO_DIM-NEXT: ^bb0(%[[PRIV_ORIG_ARG:.*]]: [[TYPE]], %[[PRIV_PRIV_ARG:.*]]: [[TYPE]]): +! TWO_DIM: hlfir.assign %[[PRIV_ORIG_ARG]] to %[[PRIV_PRIV_ARG]] temporary_lhs +! TWO_DIM-NEXT: omp.yield(%[[PRIV_PRIV_ARG]] : [[TYPE]]) +! TWO_DIM-NEXT: } diff --git a/flang/test/Lower/OpenMP/delayed-privatization-character.f90 b/flang/test/Lower/OpenMP/delayed-privatization-character.f90 new file mode 100644 index 0000000000000..756f2bb33f84b --- /dev/null +++ b/flang/test/Lower/OpenMP/delayed-privatization-character.f90 @@ -0,0 +1,40 @@ +! Test delayed privatization for the `CHARACTER` type. + +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: -o - %s 2>&1 | FileCheck %s +! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \ +! RUN: | FileCheck %s + +subroutine delayed_privatization_character(var1, l) + implicit none + integer(8):: l + character(len = l) :: var1 + +!$omp parallel firstprivate(var1) + var1 = "test" +!$omp end parallel +end subroutine + +! CHECK-LABEL: omp.private {type = firstprivate} +! CHECK-SAME: @[[PRIVATIZER_SYM:.*]] : [[TYPE:!fir.boxchar<1>]] alloc { + +! CHECK-NEXT: ^bb0(%[[PRIV_ARG:.*]]: [[TYPE]]): +! CHECK-NEXT: %[[UNBOX:.*]]:2 = fir.unboxchar %[[PRIV_ARG]] +! CHECK-NEXT: %[[PRIV_ARG_DECL:.*]]:2 = hlfir.declare %[[UNBOX]]#0 typeparams %[[UNBOX]]#1 +! CHECK: %[[PRIV_ALLOC:.*]] = fir.alloca !fir.char<1,?>(%[[UNBOX]]#1 : index) +! CHECK-NEXT: %[[PRIV_DECL:.*]]:2 = hlfir.declare %[[PRIV_ALLOC]] typeparams %[[UNBOX]]#1 +! CHECK-NEXT: omp.yield(%[[PRIV_DECL]]#0 : !fir.boxchar<1>) + +! CHECK-NEXT: } copy { +! CHECK-NEXT: ^bb0(%[[PRIV_ORIG_ARG:.*]]: [[TYPE]], %[[PRIV_PRIV_ARG:.*]]: [[TYPE]]): + +! CHECK-NEXT: %[[ORIG_UNBOX:.*]]:2 = fir.unboxchar %[[PRIV_ORIG_ARG]] +! CHECK-NEXT: %[[ORIG_DECL:.*]]:2 = hlfir.declare %[[ORIG_UNBOX]]#0 typeparams %[[ORIG_UNBOX]]#1 + +! CHECK-NEXT: %[[PRIV_UNBOX:.*]]:2 = fir.unboxchar %[[PRIV_PRIV_ARG]] +! CHECK-NEXT: %[[PRIV_DECL:.*]]:2 = hlfir.declare %[[PRIV_UNBOX]]#0 typeparams %[[PRIV_UNBOX]]#1 + +! CHECK-NEXT: hlfir.assign %[[ORIG_DECL]]#0 to %[[PRIV_DECL]]#0 + +! CHECK-NEXT: omp.yield(%[[PRIV_DECL]]#0 : !fir.boxchar<1>) +! CHECK-NEXT: }