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 @@ -754,6 +754,18 @@ return builder.create(loc, value1.getType(), add); } +static mlir::Value genComparisonCombiner(fir::FirOpBuilder &builder, + mlir::Location loc, + mlir::arith::CmpIPredicate pred, + mlir::Value value1, + mlir::Value value2) { + 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, pred, v1, v2); + return builder.create(loc, value1.getType(), add); +} + static mlir::Value genCombiner(fir::FirOpBuilder &builder, mlir::Location loc, mlir::acc::ReductionOperator op, mlir::Type ty, mlir::Value value1, mlir::Value value2) { @@ -831,6 +843,10 @@ if (op == mlir::acc::ReductionOperator::AccLor) return genLogicalCombiner(builder, loc, value1, value2); + if (op == mlir::acc::ReductionOperator::AccEqv) + return genComparisonCombiner(builder, loc, mlir::arith::CmpIPredicate::eq, + value1, value2); + 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_eqv_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: %[[EQV:.*]] = arith.cmpi eq, %[[V1]], %[[V2]] : i1 +! CHECK: %[[CONV:.*]] = fir.convert %[[EQV]] : (i1) -> !fir.logical<4> +! CHECK: acc.yield %[[CONV]] : !fir.logical<4> +! CHECK: } + ! CHECK-LABEL: acc.reduction.recipe @reduction_lor_l32 : !fir.logical<4> reduction_operator init { ! CHECK: ^bb0(%{{.*}}: !fir.logical<4>): ! CHECK: %[[CST:.*]] = arith.constant false @@ -683,3 +696,13 @@ ! CHECK-LABEL: func.func @_QPacc_reduction_or() ! CHECK: %[[RED:.*]] = acc.reduction varPtr(%{{.*}} : !fir.ref>) -> !fir.ref> {name = "l"} ! CHECK: acc.parallel reduction(@reduction_lor_l32 -> %[[RED]] : !fir.ref>) + +subroutine acc_reduction_eqv() + logical :: l + !$acc parallel reduction(.eqv.:l) + !$acc end parallel +end subroutine + +! CHECK-LABEL: func.func @_QPacc_reduction_eqv() +! CHECK: %[[RED:.*]] = acc.reduction varPtr(%{{.*}} : !fir.ref>) -> !fir.ref> {name = "l"} +! CHECK: acc.parallel reduction(@reduction_eqv_l32 -> %[[RED]] : !fir.ref>)