diff options
author | Arnamoy Bhattacharyya <arnamoy.bhattacharyya@huawei.com> | 2022-07-11 16:01:15 +0300 |
---|---|---|
committer | Arnamoy Bhattacharyya <arnamoy.bhattacharyya@huawei.com> | 2022-07-11 16:01:15 +0300 |
commit | d507e8b70e4668f891d5df03f966c154cc4d5370 (patch) | |
tree | 33a87fdd7b72ac8ba5efcd4db01ed9530a753b0e /flang | |
parent | 03fee6712a39fb4132097a61fbc7e19aeececb59 (diff) |
[flang][OpenMP] Fix firstprivate bug
In case where the bound(s) of a workshare loop use(s) firstprivate var(s), currently, that use is not updated with the created clone. It still uses the shared variable. This patch fixes that.
Reviewed By: peixin
Differential Revision: https://reviews.llvm.org/D127137
Diffstat (limited to 'flang')
-rw-r--r-- | flang/lib/Lower/Bridge.cpp | 16 | ||||
-rw-r--r-- | flang/test/Lower/OpenMP/omp-parallel-wsloop-firstpriv.f90 | 63 |
2 files changed, 79 insertions, 0 deletions
diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp index aaaf22a7c214..f99eff1c943e 100644 --- a/flang/lib/Lower/Bridge.cpp +++ b/flang/lib/Lower/Bridge.cpp @@ -472,6 +472,22 @@ public: return fir::substBase(hexv, temp); }); + // Replace all uses of the original with the clone/copy, + // esepcially for loop bounds (that uses the variable being privatised) + // since loop bounds use old values that need to be fixed by using the + // new copied value. + // Not able to use replaceAllUsesWith() because uses outside + // the loop body should not use the clone. + mlir::Region &curRegion = getFirOpBuilder().getRegion(); + mlir::Value oldVal = fir::getBase(hexv); + mlir::Value cloneVal = fir::getBase(exv); + for (auto &oper : curRegion.getOps()) { + for (unsigned int ii = 0; ii < oper.getNumOperands(); ++ii) { + if (oper.getOperand(ii) == oldVal) { + oper.setOperand(ii, cloneVal); + } + } + } return bindIfNewSymbol(sym, exv); } diff --git a/flang/test/Lower/OpenMP/omp-parallel-wsloop-firstpriv.f90 b/flang/test/Lower/OpenMP/omp-parallel-wsloop-firstpriv.f90 new file mode 100644 index 000000000000..79feaa7c3217 --- /dev/null +++ b/flang/test/Lower/OpenMP/omp-parallel-wsloop-firstpriv.f90 @@ -0,0 +1,63 @@ +! This test checks lowering of OpenMP parallel DO, with the loop bound being +! a firstprivate variable + +! RUN: bbc -fopenmp -emit-fir %s -o - | FileCheck %s + +! CHECK: func @_QPomp_do_firstprivate(%[[ARG0:.*]]: !fir.ref<i32> {fir.bindc_name = "a"}) +subroutine omp_do_firstprivate(a) + integer::a + integer::n + n = a+1 + !$omp parallel do firstprivate(a) + ! CHECK: omp.parallel { + ! CHECK-NEXT: %[[CLONE:.*]] = fir.alloca i32 {bindc_name = "a", pinned + ! CHECK-NEXT: %[[LD:.*]] = fir.load %[[ARG0]] : !fir.ref<i32> + ! CHECK-NEXT: fir.store %[[LD]] to %[[CLONE]] : !fir.ref<i32> + ! CHECK-NEXT: omp.barrier + ! CHECK-NEXT: %[[REF:.*]] = fir.alloca i32 {adapt.valuebyref, pinned} + ! CHECK: %[[LB:.*]] = arith.constant 1 : i32 + ! CHECK-NEXT: %[[UB:.*]] = fir.load %[[CLONE]] : !fir.ref<i32> + ! CHECK-NEXT: %[[STEP:.*]] = arith.constant 1 : i32 + ! CHECK-NEXT: omp.wsloop for (%[[ARG1:.*]]) : i32 = (%[[LB]]) to (%[[UB]]) inclusive step (%[[STEP]]) + ! CHECK-NEXT: fir.store %[[ARG1]] to %[[REF]] : !fir.ref<i32> + ! CHECK-NEXT: fir.call @_QPfoo(%[[REF]], %[[CLONE]]) : (!fir.ref<i32>, !fir.ref<i32>) -> () + ! CHECK-NEXT: omp.yield + do i=1, a + call foo(i, a) + end do + !$omp end parallel do + !CHECK: fir.call @_QPbar(%[[ARG0]]) : (!fir.ref<i32>) -> () + call bar(a) +end subroutine omp_do_firstprivate + +! CHECK: func @_QPomp_do_firstprivate2(%[[ARG0:.*]]: !fir.ref<i32> {fir.bindc_name = "a"}, %[[ARG1:.*]]: !fir.ref<i32> {fir.bindc_name = "n"}) +subroutine omp_do_firstprivate2(a, n) + integer::a + integer::n + n = a+1 + !$omp parallel do firstprivate(a, n) + ! CHECK: omp.parallel { + ! CHECK-NEXT: %[[CLONE:.*]] = fir.alloca i32 {bindc_name = "a", pinned + ! CHECK-NEXT: %[[LD:.*]] = fir.load %[[ARG0]] : !fir.ref<i32> + ! CHECK-NEXT: fir.store %[[LD]] to %[[CLONE]] : !fir.ref<i32> + ! CHECK-NEXT: %[[CLONE1:.*]] = fir.alloca i32 {bindc_name = "n", pinned + ! CHECK-NEXT: %[[LD1:.*]] = fir.load %[[ARG1]] : !fir.ref<i32> + ! CHECK-NEXT: fir.store %[[LD1]] to %[[CLONE1]] : !fir.ref<i32> + ! CHECK-NEXT: omp.barrier + ! CHECK-NEXT: %[[REF:.*]] = fir.alloca i32 {adapt.valuebyref, pinned} + + + ! CHECK: %[[LB:.*]] = fir.load %[[CLONE]] : !fir.ref<i32> + ! CHECK-NEXT: %[[UB:.*]] = fir.load %[[CLONE1]] : !fir.ref<i32> + ! CHECK-NEXT: %[[STEP:.*]] = arith.constant 1 : i32 + ! CHECK-NEXT: omp.wsloop for (%[[ARG2:.*]]) : i32 = (%[[LB]]) to (%[[UB]]) inclusive step (%[[STEP]]) + ! CHECK-NEXT: fir.store %[[ARG2]] to %[[REF]] : !fir.ref<i32> + ! CHECK-NEXT: fir.call @_QPfoo(%[[REF]], %[[CLONE]]) : (!fir.ref<i32>, !fir.ref<i32>) -> () + ! CHECK-NEXT: omp.yield + do i= a, n + call foo(i, a) + end do + !$omp end parallel do + !CHECK: fir.call @_QPbar(%[[ARG1]]) : (!fir.ref<i32>) -> () + call bar(n) +end subroutine omp_do_firstprivate2 |