diff options
author | Valentin Clement <clementval@gmail.com> | 2023-07-24 09:34:00 -0700 |
---|---|---|
committer | Valentin Clement <clementval@gmail.com> | 2023-07-24 09:34:31 -0700 |
commit | be5ac66643279a9803053ebb26118559ab630222 (patch) | |
tree | f97980e429c22e5132e2cabe0c622f141f590ae7 /flang | |
parent | 9d8e4759a806dd16fc59901d031ebd03f1da0183 (diff) | |
download | llvm-be5ac66643279a9803053ebb26118559ab630222.zip llvm-be5ac66643279a9803053ebb26118559ab630222.tar.gz llvm-be5ac66643279a9803053ebb26118559ab630222.tar.bz2 |
[flang][openacc] Keep original array size in reduction init region with slice
Keep the original array size when materializing the private copy.
Depends on D155882
Reviewed By: razvanlupusoru
Differential Revision: https://reviews.llvm.org/D155893
Diffstat (limited to 'flang')
-rw-r--r-- | flang/lib/Lower/OpenACC.cpp | 4 | ||||
-rw-r--r-- | flang/test/Lower/OpenACC/acc-reduction.f90 | 32 |
2 files changed, 4 insertions, 32 deletions
diff --git a/flang/lib/Lower/OpenACC.cpp b/flang/lib/Lower/OpenACC.cpp index 3d20ef5..1a39dc7 100644 --- a/flang/lib/Lower/OpenACC.cpp +++ b/flang/lib/Lower/OpenACC.cpp @@ -982,10 +982,10 @@ genReductions(const Fortran::parser::AccObjectListWithReduction &objectList, !bounds.empty())) TODO(operandLocation, "reduction with unsupported type"); - mlir::Type retTy = getTypeFromBounds(bounds, baseAddr.getType()); auto op = createDataEntryOp<mlir::acc::ReductionOp>( builder, operandLocation, baseAddr, asFortran, bounds, - /*structured=*/true, mlir::acc::DataClause::acc_reduction, retTy); + /*structured=*/true, mlir::acc::DataClause::acc_reduction, + baseAddr.getType()); mlir::Type ty = op.getAccPtr().getType(); std::string recipeName = fir::getTypeAsString( ty, converter.getKindMap(), diff --git a/flang/test/Lower/OpenACC/acc-reduction.f90 b/flang/test/Lower/OpenACC/acc-reduction.f90 index 21cdae7..068b526 100644 --- a/flang/test/Lower/OpenACC/acc-reduction.f90 +++ b/flang/test/Lower/OpenACC/acc-reduction.f90 @@ -2,34 +2,6 @@ ! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s -! CHECK-LABEL: acc.reduction.recipe @reduction_add_ref_10xi32 : !fir.ref<!fir.array<10xi32>> reduction_operator <add> init { -! CHECK: ^bb0(%{{.*}}: !fir.ref<!fir.array<10xi32>>): -! CHECK: %[[INIT:.*]] = arith.constant 0 : i32 -! CHECK: %[[ALLOCA:.*]] = fir.alloca !fir.array<10xi32> -! CHECK: %[[LB:.*]] = arith.constant 0 : index -! CHECK: %[[UB:.*]] = arith.constant 9 : index -! CHECK: %[[STEP:.*]] = arith.constant 1 : index -! CHECK: fir.do_loop %[[IV:.*]] = %[[LB]] to %[[UB]] step %[[STEP]] { -! CHECK: %[[COORD:.*]] = fir.coordinate_of %0, %[[IV]] : (!fir.ref<!fir.array<10xi32>>, index) -> !fir.ref<i32> -! CHECK: fir.store %[[INIT]] to %[[COORD]] : !fir.ref<i32> -! CHECK: } -! CHECK: acc.yield %[[ALLOCA]] : !fir.ref<!fir.array<10xi32>> -! CHECK: } combiner { -! CHECK: ^bb0(%[[ARG0:.*]]: !fir.ref<!fir.array<10xi32>>, %[[ARG1:.*]]: !fir.ref<!fir.array<10xi32>>): -! CHECK: %[[LB:.*]] = arith.constant 0 : index -! CHECK: %[[UB:.*]] = arith.constant 9 : index -! CHECK: %[[STEP:.*]] = arith.constant 1 : index -! CHECK: fir.do_loop %[[IV:.*]] = %[[LB]] to %[[UB]] step %[[STEP]] { -! CHECK: %[[COORD1:.*]] = fir.coordinate_of %[[ARG0]], %[[IV]] : (!fir.ref<!fir.array<10xi32>>, index) -> !fir.ref<i32> -! CHECK: %[[COORD2:.*]] = fir.coordinate_of %[[ARG1]], %[[IV]] : (!fir.ref<!fir.array<10xi32>>, index) -> !fir.ref<i32> -! CHECK: %[[LOAD1:.*]] = fir.load %[[COORD1]] : !fir.ref<i32> -! CHECK: %[[LOAD2:.*]] = fir.load %[[COORD2]] : !fir.ref<i32> -! CHECK: %[[COMBINED:.*]] = arith.addi %[[LOAD1]], %[[LOAD2]] : i32 -! CHECK: fir.store %[[COMBINED]] to %[[COORD1]] : !fir.ref<i32> -! CHECK: } -! CHECK: acc.yield %[[ARG0]] : !fir.ref<!fir.array<10xi32>> -! CHECK: } - ! CHECK-LABEL: acc.reduction.recipe @reduction_mul_ref_z32 : !fir.ref<!fir.complex<4>> reduction_operator <mul> init { ! CHECK: ^bb0(%{{.*}}: !fir.ref<!fir.complex<4>>): ! CHECK: %[[REAL:.*]] = arith.constant 1.000000e+00 : f32 @@ -950,5 +922,5 @@ end subroutine ! CHECK: %[[LB:.*]] = arith.constant 10 : index ! CHECK: %[[UB:.*]] = arith.constant 19 : index ! CHECK: %[[BOUND:.*]] = acc.bounds lowerbound(%[[LB]] : index) upperbound(%[[UB]] : index) stride(%[[C1]] : index) startIdx(%[[C1]] : index) -! CHECK: %[[RED:.*]] = acc.reduction varPtr(%[[ARG0]] : !fir.ref<!fir.array<100xi32>>) bounds(%[[BOUND]]) -> !fir.ref<!fir.array<10xi32>> {name = "a(11:20)"} -! CHECK: acc.parallel reduction(@reduction_add_ref_10xi32 -> %[[RED]] : !fir.ref<!fir.array<10xi32>>) +! CHECK: %[[RED:.*]] = acc.reduction varPtr(%[[ARG0]] : !fir.ref<!fir.array<100xi32>>) bounds(%[[BOUND]]) -> !fir.ref<!fir.array<100xi32>> {name = "a(11:20)"} +! CHECK: acc.parallel reduction(@reduction_add_ref_100xi32 -> %[[RED]] : !fir.ref<!fir.array<100xi32>>) |