diff --git a/flang/lib/Lower/OpenACC.cpp b/flang/lib/Lower/OpenACC.cpp --- a/flang/lib/Lower/OpenACC.cpp +++ b/flang/lib/Lower/OpenACC.cpp @@ -687,15 +687,16 @@ static mlir::Value genReductionInitValue(fir::FirOpBuilder &builder, mlir::Location loc, mlir::Type ty, mlir::acc::ReductionOperator op) { - if (op != mlir::acc::ReductionOperator::AccAdd && - op != mlir::acc::ReductionOperator::AccMul && - op != mlir::acc::ReductionOperator::AccMin && - op != mlir::acc::ReductionOperator::AccMax && - op != mlir::acc::ReductionOperator::AccIand && - op != mlir::acc::ReductionOperator::AccIor && - op != mlir::acc::ReductionOperator::AccXor) + if (op == mlir::acc::ReductionOperator::AccLor && + op == mlir::acc::ReductionOperator::AccEqv && + op == mlir::acc::ReductionOperator::AccNeqv) TODO(loc, "reduction operator"); + if (op == mlir::acc::ReductionOperator::AccLand) { + assert(mlir::isa(ty) && "expect fir.logical type"); + return builder.createBool(loc, true); + } + if (ty.isIntOrIndex()) return builder.create( loc, ty, @@ -809,6 +810,14 @@ if (op == mlir::acc::ReductionOperator::AccXor) return builder.create(loc, value1, value2); + if (op == mlir::acc::ReductionOperator::AccLand) { + mlir::Type i1 = builder.getI1Type(); + mlir::Value v1 = builder.create(loc, i1, value1); + mlir::Value v2 = builder.create(loc, i1, value2); + mlir::Value add = builder.create(loc, v1, v2); + return builder.create(loc, value1.getType(), add); + } + TODO(loc, "reduction operator"); } diff --git a/flang/test/Lower/OpenACC/acc-reduction.f90 b/flang/test/Lower/OpenACC/acc-reduction.f90 --- a/flang/test/Lower/OpenACC/acc-reduction.f90 +++ b/flang/test/Lower/OpenACC/acc-reduction.f90 @@ -2,6 +2,19 @@ ! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s +! CHECK-LABEL: acc.reduction.recipe @reduction_land_l32 : !fir.logical<4> reduction_operator init { +! CHECK: ^bb0(%{{.*}}: !fir.logical<4>): +! CHECK: %[[CST:.*]] = arith.constant true +! CHECK: acc.yield %[[CST]] : i1 +! CHECK: } combiner { +! CHECK: ^bb0(%[[ARG0:.*]]: !fir.logical<4>, %[[ARG1:.*]]: !fir.logical<4>): +! CHECK: %[[V1:.*]] = fir.convert %[[ARG0]] : (!fir.logical<4>) -> i1 +! CHECK: %[[V2:.*]] = fir.convert %[[ARG1]] : (!fir.logical<4>) -> i1 +! CHECK: %[[AND:.*]] = arith.andi %[[V1]], %[[V2]] : i1 +! CHECK: %[[CONV:.*]] = fir.convert %[[AND]] : (i1) -> !fir.logical<4> +! CHECK: acc.yield %[[CONV]] : !fir.logical<4> +! CHECK: } + ! CHECK-LABEL: acc.reduction.recipe @reduction_xor_i32 : i32 reduction_operator init { ! CHECK: ^bb0(%{{.*}}: i32): ! CHECK: %[[CST:.*]] = arith.constant 0 : i32 @@ -637,3 +650,13 @@ ! CHECK-LABEL: func.func @_QPacc_reduction_ieor() ! CHECK: %[[RED:.*]] = acc.reduction varPtr(%{{.*}} : !fir.ref) -> !fir.ref {name = "i"} ! CHECK: acc.parallel reduction(@reduction_xor_i32 -> %[[RED]] : !fir.ref) + +subroutine acc_reduction_and() + logical :: l + !$acc parallel reduction(.and.:l) + !$acc end parallel +end subroutine + +! CHECK-LABEL: func.func @_QPacc_reduction_and() +! CHECK: %[[RED:.*]] = acc.reduction varPtr(%0 : !fir.ref>) -> !fir.ref> {name = "l"} +! CHECK: acc.parallel reduction(@reduction_land_l32 -> %[[RED]] : !fir.ref>)