* [Patch] Fortran/OpenMP: Fix depend-clause handling
@ 2022-02-15 10:26 Tobias Burnus
2022-02-15 10:56 ` Jakub Jelinek
2022-02-15 16:38 ` [Patch] Fortran/OpenMP: Fix depend-clause handling Thomas Schwinge
0 siblings, 2 replies; 5+ messages in thread
From: Tobias Burnus @ 2022-02-15 10:26 UTC (permalink / raw)
To: gcc-patches, fortran, Jakub Jelinek; +Cc: Vollweiler, Marcel
[-- Attachment #1: Type: text/plain, Size: 2238 bytes --]
As found by Marcel, the 'depend' clause was differently handled in
'omp depobj(...) depend(...)' and in 'omp task depend(...)'.
The problem was that for a scalar pointer, depobj depended
on the pointer address - while task depended on the pointer-target address.
If one now combines depobj and direct var dependency, the dependency
is on different addresses, such that the dependency is not honored.
Marcel's example is testsuite/libgomp.fortran/depend-4.f90.
(Thanks for the report!)
I think in the real world, the problem is not that big as most
code either uses depobj or a variable and does not mix them. Likewise,
using the address of a temporary variable (cf. below) will also usually
work in terms of dependency.
The attached patch does:
- depend clause (as used by task etc):
For scalar allocatable/pointer, add another dereference
- For depobj (which handles the depend clause by itself)
- Fix array(element) handling by coping the depend-clause.
Before the result was 'D.123 = var; depobj = &D.123;'
which is really not intended.
- Several issues related to optional and allocatable/pointer.
OK for mainline? Does backporting to GCC 11 make sense?
Thanks,
Tobias
PS:
* I use the address of the pointer target (and not of the internal
pointer) variable, which requires that the address to which the pointer
points makes sense. (Technically, NULL and random value should be also okay, I think.)
* Likewise for 'allocatable' - which also requires that the memory
is allocated.
* OpenMP uses the word 'storage location', which is defined according to the last F2F
meeting as: "A data storage block in memory." (OpenMP Spec Pull Req. #3228)
* On the OpenMP side, there is the discussion to have a dependency on an integer
value instead of an address. (Motivated by the question whether ptr = NULL;
(void*)0x123; etc. should be valid or not.) → OpenMP Spec Issue #3226
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Attachment #2: depend-fix.diff --]
[-- Type: text/x-patch, Size: 19289 bytes --]
Fortran/OpenMP: Fix depend-clause handling
gcc/fortran/ChangeLog:
* trans-openmp.cc (gfc_trans_omp_clauses, gfc_trans_omp_depobj):
Depend on the proper addr, for ptr/alloc depend on pointee.
libgomp/ChangeLog:
* testsuite/libgomp.fortran/depend-4.f90: New test.
gcc/testsuite/ChangeLog:
* gfortran.dg/gomp/depend-4.f90: New test.
gcc/fortran/trans-openmp.cc | 45 ++++-
gcc/testsuite/gfortran.dg/gomp/depend-4.f90 | 240 +++++++++++++++++++++++++
libgomp/testsuite/libgomp.fortran/depend-4.f90 | 107 +++++++++++
3 files changed, 386 insertions(+), 6 deletions(-)
diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc
index 0eba0b3c3e1..a85f11e52d4 100644
--- a/gcc/fortran/trans-openmp.cc
+++ b/gcc/fortran/trans-openmp.cc
@@ -2890,7 +2890,9 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
gcc_assert (POINTER_TYPE_P (TREE_TYPE (decl)));
decl = build_fold_indirect_ref (decl);
}
- else if (DECL_P (decl))
+ else if (n->sym->attr.allocatable || n->sym->attr.pointer)
+ decl = build_fold_indirect_ref (decl);
+ if (DECL_P (decl))
TREE_ADDRESSABLE (decl) = 1;
OMP_CLAUSE_DECL (node) = decl;
}
@@ -5508,12 +5510,43 @@ gfc_trans_omp_depobj (gfc_code *code)
if (n)
{
tree var;
- if (n->expr)
- var = gfc_convert_expr_to_tree (&block, n->expr);
+ if (n->expr && n->expr->ref->u.ar.type != AR_FULL)
+ {
+ gfc_init_se (&se, NULL);
+ if (n->expr->ref->u.ar.type == AR_ELEMENT)
+ {
+ gfc_conv_expr_reference (&se, n->expr);
+ var = se.expr;
+ }
+ else
+ {
+ gfc_conv_expr_descriptor (&se, n->expr);
+ var = gfc_conv_array_data (se.expr);
+ }
+ gfc_add_block_to_block (&block, &se.pre);
+ gfc_add_block_to_block (&block, &se.post);
+ gcc_assert (POINTER_TYPE_P (TREE_TYPE (var)));
+ }
else
- var = gfc_get_symbol_decl (n->sym);
- if (!POINTER_TYPE_P (TREE_TYPE (var)))
- var = gfc_build_addr_expr (NULL, var);
+ {
+ var = gfc_get_symbol_decl (n->sym);
+ if (POINTER_TYPE_P (TREE_TYPE (var))
+ && GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (TREE_TYPE (var))))
+ var = build_fold_indirect_ref (var);
+ if (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (var)))
+ {
+ var = gfc_conv_descriptor_data_get (var);
+ gcc_assert (POINTER_TYPE_P (TREE_TYPE (var)));
+ }
+ else if ((n->sym->attr.allocatable || n->sym->attr.pointer)
+ && n->sym->attr.optional)
+ var = build_fold_indirect_ref (var);
+ else if (!POINTER_TYPE_P (TREE_TYPE (var)))
+ {
+ TREE_ADDRESSABLE (var) = 1;
+ var = gfc_build_addr_expr (NULL, var);
+ }
+ }
depobj = save_expr (depobj);
tree r = build_fold_indirect_ref_loc (loc, depobj);
gfc_add_expr_to_block (&block,
diff --git a/gcc/testsuite/gfortran.dg/gomp/depend-4.f90 b/gcc/testsuite/gfortran.dg/gomp/depend-4.f90
new file mode 100644
index 00000000000..d6686c1e48f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/depend-4.f90
@@ -0,0 +1,240 @@
+! { dg-do compile }
+! { dg-additional-options "-fdump-tree-gimple -fdump-tree-original" }
+
+! Check that 'omp depobj's depend and 'omp task/... depend' depend on
+! the same variable
+
+! For pointers, it depends on the address of the pointer target
+! For allocatable, on the allocated memory address
+
+subroutine foo(dss, dsp, dsa, daa, daaa, daap, doss, dosp, dosa, doaa, doaaa, doaap)
+ !use omp_lib
+ use iso_c_binding, only: c_intptr_t
+ implicit none (type, external)
+ integer, parameter :: omp_depend_kind = 2*c_intptr_t
+ integer :: ss, sp, sa, aa(4), aaa(:), aap(:)
+ integer :: dss, dsp, dsa, daa(4), daaa(:), daap(:)
+ integer :: doss, dosp, dosa, doaa(4), doaaa(:), doaap(:)
+ optional :: doss, dosp, dosa, doaa, doaaa, doaap
+ allocatable :: sa, aaa, dsa, daaa, dosa, doaaa
+ pointer :: sp, aap, dsp, daap, dosp, doaap
+
+ integer(omp_depend_kind) :: object(18)
+ integer(omp_depend_kind) :: elem(9)
+
+ !$omp depobj(object(1)) depend(in: ss)
+ !$omp depobj(object(2)) depend(in: sp)
+ !$omp depobj(object(3)) depend(in: sa)
+ !$omp depobj(object(4)) depend(in: aa)
+ !$omp depobj(object(5)) depend(in: aaa)
+ !$omp depobj(object(6)) depend(in: aap)
+ !$omp depobj(object(7)) depend(in: dss)
+ !$omp depobj(object(8)) depend(in: dsp)
+ !$omp depobj(object(9)) depend(in: dsa)
+ !$omp depobj(object(10)) depend(in: daa)
+ !$omp depobj(object(11)) depend(in: daaa)
+ !$omp depobj(object(12)) depend(in: daap)
+ !$omp depobj(object(13)) depend(in: doss)
+ !$omp depobj(object(14)) depend(in: dosp)
+ !$omp depobj(object(15)) depend(in: dosa)
+ !$omp depobj(object(16)) depend(in: doaa)
+ !$omp depobj(object(17)) depend(in: doaaa)
+ !$omp depobj(object(18)) depend(in: doaap)
+
+ !$omp depobj(elem(1)) depend(in: aa(2))
+ !$omp depobj(elem(2)) depend(in: aaa(2))
+ !$omp depobj(elem(3)) depend(in: aap(2))
+ !$omp depobj(elem(4)) depend(in: daa(2))
+ !$omp depobj(elem(5)) depend(in: daaa(2))
+ !$omp depobj(elem(6)) depend(in: daap(2))
+ !$omp depobj(elem(6)) depend(in: doaa(2))
+ !$omp depobj(elem(8)) depend(in: doaaa(2))
+ !$omp depobj(elem(9)) depend(in: doaap(2))
+
+ !$omp parallel
+ !$omp single
+ !$omp task depend(out: ss)
+ ss = 4
+ !$omp end task
+ !$omp task depend(out: sp)
+ sp = 4
+ !$omp end task
+ !$omp task depend(out: sa)
+ sa = 4
+ !$omp end task
+ !$omp task depend(out: aa)
+ aa = 4
+ !$omp end task
+ !$omp task depend(out: aaa)
+ aaa = 4
+ !$omp end task
+ !$omp task depend(out: aap)
+ aap = 4
+ !$omp end task
+ !$omp task depend(out: dss)
+ dss = 4
+ !$omp end task
+ !$omp task depend(out: dsp)
+ dsp = 4
+ !$omp end task
+ !$omp task depend(out: dsa)
+ dsa = 4
+ !$omp end task
+ !$omp task depend(out: daa)
+ daa = 4
+ !$omp end task
+ !$omp task depend(out: daaa)
+ daaa = 4
+ !$omp end task
+ !$omp task depend(out: daap)
+ daap = 4
+ !$omp end task
+ !$omp task depend(out: doss)
+ doss = 4
+ !$omp end task
+ !$omp task depend(out: dosp)
+ dosp = 4
+ !$omp end task
+ !$omp task depend(out: dosa)
+ dosa = 4
+ !$omp end task
+ !$omp task depend(out: doaa)
+ doaa = 4
+ !$omp end task
+ !$omp task depend(out: doaaa)
+ doaaa = 4
+ !$omp end task
+ !$omp task depend(out: doaap)
+ doaap = 4
+ !$omp end task
+
+ !$omp task depend(out: aa(2))
+ aa(2) = 4
+ !$omp end task
+ !$omp task depend(out: aaa(2))
+ aaa(2) = 4
+ !$omp end task
+ !$omp task depend(out: aap(2))
+ aap(2) = 4
+ !$omp end task
+ !$omp task depend(out: daa(2))
+ daa(2) = 4
+ !$omp end task
+ !$omp task depend(out: daaa(2))
+ daaa(2) = 4
+ !$omp end task
+ !$omp task depend(out: daap(2))
+ daap(2) = 4
+ !$omp end task
+ !$omp task depend(out: doaa(2))
+ doaa(2) = 4
+ !$omp end task
+ !$omp task depend(out: doaaa(2))
+ doaaa(2) = 4
+ !$omp end task
+ !$omp task depend(out: doaap(2))
+ doaap(2) = 4
+ !$omp end task
+ !$omp end single
+ !$omp end parallel
+end
+
+subroutine bar
+ implicit none (type, external)
+ integer :: depvar, x
+
+ x = 7
+ !$omp parallel
+ !$omp single
+ !$omp task depend(out: depvar)
+ x =5
+ !$omp end task
+ !$omp task depend(in: depvar)
+ if (x /= 5) stop
+ !$omp end task
+ !$omp end single
+ !$omp end parallel
+end
+
+! depvar - only used for dependency, but should still be used in depend:
+
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:depvar\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(in:depvar\\)" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "&object\\\[0\\\] = &ss;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[1\\\] = sp;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[2\\\] = sa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[3\\\] = &aa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[4\\\] = .integer.kind=4.\\\[0:\\\] \\* restrict\\) aaa.data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[5\\\] = .integer.kind=4.\\\[0:\\\] \\*\\) aap.data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[6\\\] = dss;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[7\\\] = dsp;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[8\\\] = dsa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[9\\\] = daa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[10\\\] = .integer.kind=4.\\\[0:\\\] \\* restrict\\) daaa->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[11\\\] = .integer.kind=4.\\\[0:\\\] \\*\\) daap->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[12\\\] = doss;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[13\\\] = \\*dosp;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[14\\\] = \\*dosa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[15\\\] = doaa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[16\\\] = .integer.kind=4.\\\[0:\\\] \\* restrict\\) doaaa->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[17\\\] = .integer.kind=4.\\\[0:\\\] \\*\\) doaap->data;" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "&elem\\\[0\\\] = &aa\\\[1\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[1\\\] = &\\(\\*\\(integer.kind=4.\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[2\\\] = \\(integer.kind=4. \\*\\) \\(aap.data \\+ .sizetype. \\(\\(aap.offset \\+ aap.dim\\\[0\\\].stride \\* 2\\) \\* aap.span\\)\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[3\\\] = &\\(\\*daa\\)\\\[1\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[4\\\] = &\\(\\*\\(integer.kind=4.\\\[0:\\\] \\* restrict\\) daaa->data\\)\\\[daaa->offset \\+ 2\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[5\\\] = \\(integer.kind=4. \\*\\) \\(daap->data \\+ .sizetype. \\(\\(daap->offset \\+ daap->dim\\\[0\\\].stride \\* 2\\) \\* daap->span\\)\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[5\\\] = &\\(\\*doaa\\)\\\[1\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[7\\\] = &\\(\\*\\(integer.kind=4.\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[8\\\] = \\(integer.kind=4. \\*\\) \\(doaap->data \\+ .sizetype. \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\);" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:ss\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*sp\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*sa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:aa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\* restrict\\) aaa.data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\*\\) aap.data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*dss\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dsp\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dsa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*daa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\* restrict\\) daaa->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\*\\) daap->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*doss\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dosp\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dosa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*doaa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\* restrict\\) doaaa->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\*\\) doaap->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:aa\\\[1\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\) \\*\\) \\(aap.data \\+ \\(sizetype\\) \\(\\(aap.offset \\+ aap.dim\\\[0\\\].stride \\* 2\\) \\* aap.span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*daa\\)\\\[1\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\* restrict\\) daaa->data\\)\\\[daaa->offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\) \\*\\) \\(daap->data \\+ \\(sizetype\\) \\(\\(daap->offset \\+ daap->dim\\\[0\\\].stride \\* 2\\) \\* daap->span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*doaa\\)\\\[1\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\) \\*\\) \\(doaap->data \\+ \\(sizetype\\) \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\)\\)" 1 "original" } }
+
+
+! gimple dump - check only those which are simple one-line checkable:
+
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&ss\\) shared\\(ss\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:sp\\) shared\\(sp\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:sa\\) shared\\(sa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&aa\\) shared\\(aa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:dss\\) shared\\(dss\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:daa\\) shared\\(daa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:doss\\) shared\\(doss\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:doaa\\) shared\\(doaa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&aa\\\[1\\\]\\) shared\\(aa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dsp;" 2 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dsa;" 3 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dosp;" 2 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dosa;" 3 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = doaaa->data;" 4 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = doaap->data;" 4 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = &\\(\\*daa\\)\\\[1\\\];" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = &\\(\\*doaa\\)\\\[1\\\];" 1 "gimple" } }
diff --git a/libgomp/testsuite/libgomp.fortran/depend-4.f90 b/libgomp/testsuite/libgomp.fortran/depend-4.f90
new file mode 100644
index 00000000000..0dee2c6faf1
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/depend-4.f90
@@ -0,0 +1,107 @@
+! { dg-additional-options "-fdump-tree-gimple" }
+!
+! { dg-additional-sources my-usleep.c }
+! { dg-prune-output "command-line option '-fintrinsic-modules-path=.*' is valid for Fortran but not for C" }
+!
+! Ensure that 'depend(...: var)' and 'depobj(...) depend(...: var)'
+! depend on the same variable when 'var' is a pointer
+!
+program main
+ use omp_lib
+ use iso_c_binding
+ implicit none (external, type)
+
+ interface
+ subroutine usleep(t) bind(C, name="my_usleep")
+ use iso_c_binding
+ integer(c_int), value :: t
+ end subroutine
+ end interface
+
+ integer :: bbb
+ integer, target :: c
+ integer(omp_depend_kind) :: obj(2)
+ integer, pointer :: ppp
+
+ integer :: x1, x2, x3
+
+ c = 42
+ ppp => c
+
+ if (.not. associated (ppp)) &
+ stop 0;
+
+ x1 = 43
+ x2 = 44
+ x3 = 45
+ !$omp depobj(obj(1)) depend(inout: ppp)
+ !$omp depobj(obj(2)) depend(in: bbb)
+
+ !$omp parallel num_threads(5)
+ !$omp single
+
+ !$omp task depend (out: ppp)
+ write (*,*) "task 1 (start)"
+ call usleep(40)
+ if (x1 /= 43) stop 11
+ if (x2 /= 44) stop 12
+ x1 = 11
+ write (*,*) "task 1 (end)"
+ !$omp end task
+
+ !$omp task depend(inout: ppp)
+ write (*,*) "task 2 (start)"
+ call usleep(30)
+ if (x1 /= 11) stop 21
+ if (x2 /= 44) stop 22
+ x1 = 111
+ x2 = 222
+ write (*,*) "task 2 (end)"
+ !$omp end task
+
+ !$omp task depend(out: bbb)
+ write (*,*) "task 3 (start)"
+ call usleep(40)
+ if (x3 /= 45) stop 3
+ x3 = 33
+ write (*,*) "task 3 (end)"
+ !$omp end task
+
+ !$omp task depend(depobj: obj(1), obj(2))
+ write (*,*) "task 4 (start)"
+ if (x1 /= 111) stop 41
+ if (x2 /= 222) stop 42
+ if (x3 /= 33) stop 43
+ call usleep(10)
+ x1 = 411
+ x2 = 422
+ x3 = 433
+ write (*,*) "task 4 (end)"
+ !$omp end task
+
+ !$omp task depend(in: ppp)
+ if (x1 /= 411) stop 51
+ if (x2 /= 422) stop 52
+ if (x3 /= 433) stop 53
+ write (*,*) "task 5"
+ !$omp end task
+
+ !$omp end single
+ !$omp end parallel
+
+ ! expectation (task dependencies):
+ ! 1 - 2 \
+ ! 4 - 5
+ ! 3 ----/
+
+end program main
+
+! Ensure that the pointer target address for ppp is taken
+! but the address of bbb itself:
+
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:ppp.\[0-9\]+\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(inout:ppp.\[0-9\]+\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(in:ppp.\[0-9\]+\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&bbb\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "MEM\\\[\[^\r\n]+\\\] = ppp.\[0-9_\]+;" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "MEM\\\[\[^\r\n]+\\\] = &bbb;" 1 "gimple" } }
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Patch] Fortran/OpenMP: Fix depend-clause handling
2022-02-15 10:26 [Patch] Fortran/OpenMP: Fix depend-clause handling Tobias Burnus
@ 2022-02-15 10:56 ` Jakub Jelinek
2022-02-15 17:01 ` [Patch] Fortran/OpenMP: Fix depend-clause handling for c_ptr (was: [Patch] Fortran/OpenMP: Fix depend-clause handling) Tobias Burnus
2022-02-15 16:38 ` [Patch] Fortran/OpenMP: Fix depend-clause handling Thomas Schwinge
1 sibling, 1 reply; 5+ messages in thread
From: Jakub Jelinek @ 2022-02-15 10:56 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc-patches, fortran, Vollweiler, Marcel
On Tue, Feb 15, 2022 at 11:26:12AM +0100, Tobias Burnus wrote:
> As found by Marcel, the 'depend' clause was differently handled in
> 'omp depobj(...) depend(...)' and in 'omp task depend(...)'.
>
> The problem was that for a scalar pointer, depobj depended
> on the pointer address - while task depended on the pointer-target address.
>
> If one now combines depobj and direct var dependency, the dependency
> is on different addresses, such that the dependency is not honored.
> Marcel's example is testsuite/libgomp.fortran/depend-4.f90.
> (Thanks for the report!)
>
>
> I think in the real world, the problem is not that big as most
> code either uses depobj or a variable and does not mix them. Likewise,
> using the address of a temporary variable (cf. below) will also usually
> work in terms of dependency.
>
>
> The attached patch does:
> - depend clause (as used by task etc):
> For scalar allocatable/pointer, add another dereference
>
> - For depobj (which handles the depend clause by itself)
> - Fix array(element) handling by coping the depend-clause.
> Before the result was 'D.123 = var; depobj = &D.123;'
> which is really not intended.
> - Several issues related to optional and allocatable/pointer.
>
> OK for mainline? Does backporting to GCC 11 make sense?
Ok. Dunno about backporting, perhaps later.
Jakub
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Patch] Fortran/OpenMP: Fix depend-clause handling
2022-02-15 10:26 [Patch] Fortran/OpenMP: Fix depend-clause handling Tobias Burnus
2022-02-15 10:56 ` Jakub Jelinek
@ 2022-02-15 16:38 ` Thomas Schwinge
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Schwinge @ 2022-02-15 16:38 UTC (permalink / raw)
To: Tobias Burnus; +Cc: Marcel Vollweiler, gcc-patches, fortran, Jakub Jelinek
Hi!
On 2022-02-15T11:26:12+0100, Tobias Burnus <tobias@codesourcery.com> wrote:
> As found by Marcel, the 'depend' clause was differently handled in
> 'omp depobj(...) depend(...)' and in 'omp task depend(...)'.
(Cross-referencing GCC PR104545 "[OpenMP & Fortran] Pointers issue in
combination of depobj construct and depend clause with depobj
dependence-type".)
> The attached patch [...]
> gcc/fortran/trans-openmp.cc | 45 ++++-
> gcc/testsuite/gfortran.dg/gomp/depend-4.f90 | 240 +++++++++++++++++++++++++
> libgomp/testsuite/libgomp.fortran/depend-4.f90 | 107 +++++++++++
The actual commit r12-7242-g3939c1b11279dc950d2f160eb940dd791f7b40f1
"Fortran/OpenMP: Fix depend-clause handling" also has:
| gcc/testsuite/gfortran.dg/gomp/depend-5.f90 | 82 +++++++++
... (yay for more test cases!), and that one I see partially FAIL in
x86_64 '-m32'/'-mx32' testing:
FAIL: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=16\\)\\[0:\\] \\* restrict\\) aaa.data\\)\\[aaa.offset \\+ 2\\]\\)" 1
FAIL: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=16\\)\\[0:\\] \\* restrict\\) daaa->data\\)\\[daaa->offset \\+ 2\\]\\)" 1
FAIL: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=16\\)\\[0:\\] \\* restrict\\) doaaa->data\\)\\[doaaa->offset \\+ 2\\]\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\(\\*daa\\)\\[1\\]\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\(\\*doaa\\)\\[1\\]\\)" 1
FAIL: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=16\\) \\*\\) \\(aap.data \\+ \\(sizetype\\) \\(\\(aap.offset \\+ aap.dim\\[0\\].stride \\* 2\\) \\* aap.span\\)\\)\\)" 1
FAIL: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=16\\) \\*\\) \\(daap->data \\+ \\(sizetype\\) \\(\\(daap->offset \\+ daap->dim\\[0\\].stride \\* 2\\) \\* daap->span\\)\\)\\)" 1
FAIL: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=16\\) \\*\\) \\(doaap->data \\+ \\(sizetype\\) \\(\\(doaap->offset \\+ doaap->dim\\[0\\].stride \\* 2\\) \\* doaap->span\\)\\)\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*\\*dosa\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*\\*dosp\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*\\*dsa\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*\\*dsp\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*doss\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*dss\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*sa\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:\\*sp\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:aa\\[1\\]\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O scan-tree-dump-times original "#pragma omp task depend\\(depobj:ss\\)" 1
PASS: gfortran.dg/gomp/depend-5.f90 -O (test for excess errors)
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Patch] Fortran/OpenMP: Fix depend-clause handling for c_ptr (was: [Patch] Fortran/OpenMP: Fix depend-clause handling)
2022-02-15 10:56 ` Jakub Jelinek
@ 2022-02-15 17:01 ` Tobias Burnus
2022-02-15 17:36 ` Jakub Jelinek
0 siblings, 1 reply; 5+ messages in thread
From: Tobias Burnus @ 2022-02-15 17:01 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: gcc-patches, fortran, Vollweiler, Marcel
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]
On 15.02.22 11:56, Jakub Jelinek wrote:
> On Tue, Feb 15, 2022 at 11:26:12AM +0100, Tobias Burnus wrote:
>> As found by Marcel, the 'depend' clause was differently handled in
>> 'omp depobj(...) depend(...)' and in 'omp task depend(...)'.
As Marcel reported, there was still a problem with c_ptr.
Looking at the dump, I also spotted that for a nonoptional dummy
argument, scalar allocatable/pointers should have a '*' for depobj,
which I fixed. I additionally added a VALUE attribute test.
I then copied the depend-4.f90 to depend-6.f90 and replaced 'integer' by
'type(c_ptr)' as depend-clause variable (and 'integer(kind=4)' by 'void
*' in the expected dump). Otherwise, those two files should be identical.
I hope it now works and I did not miss anything in the dump.
OK?
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Attachment #2: depend-fix-fix.diff --]
[-- Type: text/x-patch, Size: 25008 bytes --]
Fortran/OpenMP: Fix depend-clause handling for c_ptr
gcc/fortran/ChangeLog:
* trans-openmp.cc (gfc_trans_omp_depobj): Fix to alloc/ptr dummy
and for c_ptr.
gcc/testsuite/ChangeLog:
* gfortran.dg/gomp/depend-4.f90: Add VALUE test, update scan test.
* gfortran.dg/gomp/depend-5.f90: Fix scan tree for -m32.
* gfortran.dg/gomp/depend-6.f90: New test.
gcc/fortran/trans-openmp.cc | 7 +-
gcc/testsuite/gfortran.dg/gomp/depend-4.f90 | 29 +++-
gcc/testsuite/gfortran.dg/gomp/depend-5.f90 | 12 +-
gcc/testsuite/gfortran.dg/gomp/depend-6.f90 | 259 ++++++++++++++++++++++++++++
4 files changed, 295 insertions(+), 12 deletions(-)
diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc
index e1c9d46add6..4d56a771349 100644
--- a/gcc/fortran/trans-openmp.cc
+++ b/gcc/fortran/trans-openmp.cc
@@ -5536,9 +5536,12 @@ gfc_trans_omp_depobj (gfc_code *code)
gcc_assert (POINTER_TYPE_P (TREE_TYPE (var)));
}
else if ((n->sym->attr.allocatable || n->sym->attr.pointer)
- && n->sym->attr.optional)
+ && n->sym->attr.dummy)
var = build_fold_indirect_ref (var);
- else if (!POINTER_TYPE_P (TREE_TYPE (var)))
+ else if (!POINTER_TYPE_P (TREE_TYPE (var))
+ || (n->sym->ts.f90_type == BT_VOID
+ && !POINTER_TYPE_P (TREE_TYPE (TREE_TYPE (var)))
+ && !GFC_ARRAY_TYPE_P (TREE_TYPE (TREE_TYPE (var)))))
{
TREE_ADDRESSABLE (var) = 1;
var = gfc_build_addr_expr (NULL, var);
diff --git a/gcc/testsuite/gfortran.dg/gomp/depend-4.f90 b/gcc/testsuite/gfortran.dg/gomp/depend-4.f90
index d6686c1e48f..f6cf2fd2dd4 100644
--- a/gcc/testsuite/gfortran.dg/gomp/depend-4.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/depend-4.f90
@@ -7,7 +7,8 @@
! For pointers, it depends on the address of the pointer target
! For allocatable, on the allocated memory address
-subroutine foo(dss, dsp, dsa, daa, daaa, daap, doss, dosp, dosa, doaa, doaaa, doaap)
+subroutine foo(dss, dsp, dsa, daa, daaa, daap, doss, dosp, dosa, doaa, doaaa, doaap, &
+ dssv, dossv)
!use omp_lib
use iso_c_binding, only: c_intptr_t
implicit none (type, external)
@@ -18,8 +19,10 @@ subroutine foo(dss, dsp, dsa, daa, daaa, daap, doss, dosp, dosa, doaa, doaaa, do
optional :: doss, dosp, dosa, doaa, doaaa, doaap
allocatable :: sa, aaa, dsa, daaa, dosa, doaaa
pointer :: sp, aap, dsp, daap, dosp, doaap
+ integer, value :: dssv, dossv
+ optional :: dossv
- integer(omp_depend_kind) :: object(18)
+ integer(omp_depend_kind) :: object(20)
integer(omp_depend_kind) :: elem(9)
!$omp depobj(object(1)) depend(in: ss)
@@ -40,6 +43,8 @@ subroutine foo(dss, dsp, dsa, daa, daaa, daap, doss, dosp, dosa, doaa, doaaa, do
!$omp depobj(object(16)) depend(in: doaa)
!$omp depobj(object(17)) depend(in: doaaa)
!$omp depobj(object(18)) depend(in: doaap)
+ !$omp depobj(object(19)) depend(in: dssv)
+ !$omp depobj(object(20)) depend(in: dossv)
!$omp depobj(elem(1)) depend(in: aa(2))
!$omp depobj(elem(2)) depend(in: aaa(2))
@@ -107,6 +112,12 @@ subroutine foo(dss, dsp, dsa, daa, daaa, daap, doss, dosp, dosa, doaa, doaaa, do
!$omp task depend(out: doaap)
doaap = 4
!$omp end task
+ !$omp task depend(out: dossv)
+ dossv = 4
+ !$omp end task
+ !$omp task depend(out: dssv)
+ dssv = 4
+ !$omp end task
!$omp task depend(out: aa(2))
aa(2) = 4
@@ -168,8 +179,8 @@ end
! { dg-final { scan-tree-dump-times "&object\\\[4\\\] = .integer.kind=4.\\\[0:\\\] \\* restrict\\) aaa.data;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&object\\\[5\\\] = .integer.kind=4.\\\[0:\\\] \\*\\) aap.data;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&object\\\[6\\\] = dss;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "&object\\\[7\\\] = dsp;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "&object\\\[8\\\] = dsa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[7\\\] = \\*dsp;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[8\\\] = \\*dsa;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&object\\\[9\\\] = daa;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&object\\\[10\\\] = .integer.kind=4.\\\[0:\\\] \\* restrict\\) daaa->data;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&object\\\[11\\\] = .integer.kind=4.\\\[0:\\\] \\*\\) daap->data;" 1 "original" } }
@@ -179,6 +190,8 @@ end
! { dg-final { scan-tree-dump-times "&object\\\[15\\\] = doaa;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&object\\\[16\\\] = .integer.kind=4.\\\[0:\\\] \\* restrict\\) doaaa->data;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&object\\\[17\\\] = .integer.kind=4.\\\[0:\\\] \\*\\) doaap->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[18\\\] = &dssv;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[19\\\] = &dossv;" 1 "original" } }
! { dg-final { scan-tree-dump-times "&elem\\\[0\\\] = &aa\\\[1\\\];" 1 "original" } }
! { dg-final { scan-tree-dump-times "&elem\\\[1\\\] = &\\(\\*\\(integer.kind=4.\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\];" 1 "original" } }
@@ -217,6 +230,8 @@ end
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*doaa\\)\\\[1\\\]\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*\\(integer\\(kind=4\\)\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\]\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(integer\\(kind=4\\) \\*\\) \\(doaap->data \\+ \\(sizetype\\) \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:dossv\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:dssv\\)" 1 "original" } }
! gimple dump - check only those which are simple one-line checkable:
@@ -230,6 +245,8 @@ end
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:doss\\) shared\\(doss\\)" 1 "gimple" } }
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:doaa\\) shared\\(doaa\\)" 1 "gimple" } }
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&aa\\\[1\\\]\\) shared\\(aa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&dossv\\) shared\\(dossv\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&dssv\\) shared\\(dssv\\)" 1 "gimple" } }
! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dsp;" 2 "gimple" } }
! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dsa;" 3 "gimple" } }
! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dosp;" 2 "gimple" } }
@@ -238,3 +255,7 @@ end
! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = doaap->data;" 4 "gimple" } }
! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = &\\(\\*daa\\)\\\[1\\\];" 1 "gimple" } }
! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = &\\(\\*doaa\\)\\\[1\\\];" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "= &dssv;" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "= &dossv;" 1 "gimple" } }
+
+
diff --git a/gcc/testsuite/gfortran.dg/gomp/depend-5.f90 b/gcc/testsuite/gfortran.dg/gomp/depend-5.f90
index 6a32b6b5cf9..4cbe3d47d02 100644
--- a/gcc/testsuite/gfortran.dg/gomp/depend-5.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/depend-5.f90
@@ -72,11 +72,11 @@ end
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\*dosa\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:aa\\\[1\\\]\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=16\\)\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\]\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=16\\) \\*\\) \\(aap.data \\+ \\(sizetype\\) \\(\\(aap.offset \\+ aap.dim\\\[0\\\].stride \\* 2\\) \\* aap.span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=\[0-9\]+\\)\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=\[0-9\]+\\) \\*\\) \\(aap.data \\+ \\(sizetype\\) \\(\\(aap.offset \\+ aap.dim\\\[0\\\].stride \\* 2\\) \\* aap.span\\)\\)\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*daa\\)\\\[1\\\]\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=16\\)\\\[0:\\\] \\* restrict\\) daaa->data\\)\\\[daaa->offset \\+ 2\\\]\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=16\\) \\*\\) \\(daap->data \\+ \\(sizetype\\) \\(\\(daap->offset \\+ daap->dim\\\[0\\\].stride \\* 2\\) \\* daap->span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=\[0-9\]+\\)\\\[0:\\\] \\* restrict\\) daaa->data\\)\\\[daaa->offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=\[0-9\]+\\) \\*\\) \\(daap->data \\+ \\(sizetype\\) \\(\\(daap->offset \\+ daap->dim\\\[0\\\].stride \\* 2\\) \\* daap->span\\)\\)\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*doaa\\)\\\[1\\\]\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=16\\)\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\]\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=16\\) \\*\\) \\(doaap->data \\+ \\(sizetype\\) \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=\[0-9\]+\\)\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=\[0-9\]+\\) \\*\\) \\(doaap->data \\+ \\(sizetype\\) \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\)\\)" 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/depend-6.f90 b/gcc/testsuite/gfortran.dg/gomp/depend-6.f90
new file mode 100644
index 00000000000..b6c1afee127
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/depend-6.f90
@@ -0,0 +1,259 @@
+! { dg-do compile }
+! { dg-additional-options "-fdump-tree-gimple -fdump-tree-original" }
+
+! Check that 'omp depobj's depend and 'omp task/... depend' depend on
+! the same variable
+
+! For pointers, it depends on the address of the pointer target
+! For allocatable, on the allocated memory address
+
+subroutine foo(dss, dsp, dsa, daa, daaa, daap, doss, dosp, dosa, doaa, doaaa, doaap, &
+ dssv, dossv)
+ !use omp_lib
+ use iso_c_binding, only: c_intptr_t, c_ptr, c_null_ptr
+ implicit none (type, external)
+ integer, parameter :: omp_depend_kind = 2*c_intptr_t
+ type(c_ptr) :: ss, sp, sa, aa(4), aaa(:), aap(:)
+ type(c_ptr) :: dss, dsp, dsa, daa(4), daaa(:), daap(:)
+ type(c_ptr) :: doss, dosp, dosa, doaa(4), doaaa(:), doaap(:)
+ optional :: doss, dosp, dosa, doaa, doaaa, doaap
+ allocatable :: sa, aaa, dsa, daaa, dosa, doaaa
+ pointer :: sp, aap, dsp, daap, dosp, doaap
+ type(c_ptr), value :: dssv, dossv
+ optional :: dossv
+
+ integer(omp_depend_kind) :: object(20)
+ integer(omp_depend_kind) :: elem(9)
+
+ !$omp depobj(object(1)) depend(in: ss)
+ !$omp depobj(object(2)) depend(in: sp)
+ !$omp depobj(object(3)) depend(in: sa)
+ !$omp depobj(object(4)) depend(in: aa)
+ !$omp depobj(object(5)) depend(in: aaa)
+ !$omp depobj(object(6)) depend(in: aap)
+ !$omp depobj(object(7)) depend(in: dss)
+ !$omp depobj(object(8)) depend(in: dsp)
+ !$omp depobj(object(9)) depend(in: dsa)
+ !$omp depobj(object(10)) depend(in: daa)
+ !$omp depobj(object(11)) depend(in: daaa)
+ !$omp depobj(object(12)) depend(in: daap)
+ !$omp depobj(object(13)) depend(in: doss)
+ !$omp depobj(object(14)) depend(in: dosp)
+ !$omp depobj(object(15)) depend(in: dosa)
+ !$omp depobj(object(16)) depend(in: doaa)
+ !$omp depobj(object(17)) depend(in: doaaa)
+ !$omp depobj(object(18)) depend(in: doaap)
+ !$omp depobj(object(19)) depend(in: dssv)
+ !$omp depobj(object(20)) depend(in: dossv)
+
+ !$omp depobj(elem(1)) depend(in: aa(2))
+ !$omp depobj(elem(2)) depend(in: aaa(2))
+ !$omp depobj(elem(3)) depend(in: aap(2))
+ !$omp depobj(elem(4)) depend(in: daa(2))
+ !$omp depobj(elem(5)) depend(in: daaa(2))
+ !$omp depobj(elem(6)) depend(in: daap(2))
+ !$omp depobj(elem(6)) depend(in: doaa(2))
+ !$omp depobj(elem(8)) depend(in: doaaa(2))
+ !$omp depobj(elem(9)) depend(in: doaap(2))
+
+ !$omp parallel
+ !$omp single
+ !$omp task depend(out: ss)
+ ss = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: sp)
+ sp = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: sa)
+ sa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: aa)
+ aa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: aaa)
+ aaa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: aap)
+ aap = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: dss)
+ dss = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: dsp)
+ dsp = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: dsa)
+ dsa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: daa)
+ daa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: daaa)
+ daaa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: daap)
+ daap = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: doss)
+ doss = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: dosp)
+ dosp = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: dosa)
+ dosa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: doaa)
+ doaa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: doaaa)
+ doaaa = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: doaap)
+ doaap = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: dossv)
+ dossv = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: dssv)
+ dssv = c_null_ptr
+ !$omp end task
+
+ !$omp task depend(out: aa(2))
+ aa(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: aaa(2))
+ aaa(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: aap(2))
+ aap(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: daa(2))
+ daa(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: daaa(2))
+ daaa(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: daap(2))
+ daap(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: doaa(2))
+ doaa(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: doaaa(2))
+ doaaa(2) = c_null_ptr
+ !$omp end task
+ !$omp task depend(out: doaap(2))
+ doaap(2) = c_null_ptr
+ !$omp end task
+ !$omp end single
+ !$omp end parallel
+end
+
+subroutine bar
+ implicit none (type, external)
+ integer :: depvar, x
+
+ x = 7
+ !$omp parallel
+ !$omp single
+ !$omp task depend(out: depvar)
+ x =5
+ !$omp end task
+ !$omp task depend(in: depvar)
+ if (x /= 5) stop
+ !$omp end task
+ !$omp end single
+ !$omp end parallel
+end
+
+! depvar - only used for dependency, but should still be used in depend:
+
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:depvar\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(in:depvar\\)" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "&object\\\[0\\\] = &ss;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[1\\\] = sp;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[2\\\] = sa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[3\\\] = &aa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[4\\\] = .void \\*\\\[0:\\\] \\* restrict\\) aaa.data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[5\\\] = .void \\*\\\[0:\\\] \\*\\) aap.data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[6\\\] = dss;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[7\\\] = \\*dsp;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[8\\\] = \\*dsa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[9\\\] = daa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[10\\\] = .void \\*\\\[0:\\\] \\* restrict\\) daaa->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[11\\\] = .void \\*\\\[0:\\\] \\*\\) daap->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[12\\\] = doss;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[13\\\] = \\*dosp;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[14\\\] = \\*dosa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[15\\\] = doaa;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[16\\\] = .void \\*\\\[0:\\\] \\* restrict\\) doaaa->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[17\\\] = .void \\*\\\[0:\\\] \\*\\) doaap->data;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[18\\\] = &dssv;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&object\\\[19\\\] = &dossv;" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "&elem\\\[0\\\] = &aa\\\[1\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[1\\\] = &\\(\\*\\(void \\*\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[2\\\] = \\(void \\* \\*\\) \\(aap.data \\+ .sizetype. \\(\\(aap.offset \\+ aap.dim\\\[0\\\].stride \\* 2\\) \\* aap.span\\)\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[3\\\] = &\\(\\*daa\\)\\\[1\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[4\\\] = &\\(\\*\\(void \\*\\\[0:\\\] \\* restrict\\) daaa->data\\)\\\[daaa->offset \\+ 2\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[5\\\] = \\(void \\* \\*\\) \\(daap->data \\+ .sizetype. \\(\\(daap->offset \\+ daap->dim\\\[0\\\].stride \\* 2\\) \\* daap->span\\)\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[5\\\] = &\\(\\*doaa\\)\\\[1\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[7\\\] = &\\(\\*\\(void \\*\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\];" 1 "original" } }
+! { dg-final { scan-tree-dump-times "&elem\\\[8\\\] = \\(void \\* \\*\\) \\(doaap->data \\+ .sizetype. \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\);" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:ss\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*sp\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*sa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:aa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\*\\\[0:\\\] \\* restrict\\) aaa.data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\*\\\[0:\\\] \\*\\) aap.data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*dss\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dsp\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dsa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*daa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\*\\\[0:\\\] \\* restrict\\) daaa->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\*\\\[0:\\\] \\*\\) daap->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*doss\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dosp\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\*dosa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*doaa\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\*\\\[0:\\\] \\* restrict\\) doaaa->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\*\\\[0:\\\] \\*\\) doaap->data\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:aa\\\[1\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*\\(void \\*\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\* \\*\\) \\(aap.data \\+ \\(sizetype\\) \\(\\(aap.offset \\+ aap.dim\\\[0\\\].stride \\* 2\\) \\* aap.span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*daa\\)\\\[1\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*\\(void \\*\\\[0:\\\] \\* restrict\\) daaa->data\\)\\\[daaa->offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\* \\*\\) \\(daap->data \\+ \\(sizetype\\) \\(\\(daap->offset \\+ daap->dim\\\[0\\\].stride \\* 2\\) \\* daap->span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*doaa\\)\\\[1\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\(\\*\\(void \\*\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\]\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:\\*\\(void \\* \\*\\) \\(doaap->data \\+ \\(sizetype\\) \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\)\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:dossv\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:dssv\\)" 1 "original" } }
+
+
+! gimple dump - check only those which are simple one-line checkable:
+
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&ss\\) shared\\(ss\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:sp\\) shared\\(sp\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:sa\\) shared\\(sa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&aa\\) shared\\(aa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:dss\\) shared\\(dss\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:daa\\) shared\\(daa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:doss\\) shared\\(doss\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:doaa\\) shared\\(doaa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&aa\\\[1\\\]\\) shared\\(aa\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&dossv\\) shared\\(dossv\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(out:&dssv\\) shared\\(dssv\\)" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dsp;" 2 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dsa;" 3 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dosp;" 2 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = \\*dosa;" 3 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = doaaa->data;" 4 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = doaap->data;" 4 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = &\\(\\*daa\\)\\\[1\\\];" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = &\\(\\*doaa\\)\\\[1\\\];" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "= &dssv;" 1 "gimple" } }
+! { dg-final { scan-tree-dump-times "= &dossv;" 1 "gimple" } }
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Patch] Fortran/OpenMP: Fix depend-clause handling for c_ptr (was: [Patch] Fortran/OpenMP: Fix depend-clause handling)
2022-02-15 17:01 ` [Patch] Fortran/OpenMP: Fix depend-clause handling for c_ptr (was: [Patch] Fortran/OpenMP: Fix depend-clause handling) Tobias Burnus
@ 2022-02-15 17:36 ` Jakub Jelinek
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Jelinek @ 2022-02-15 17:36 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc-patches, fortran, Vollweiler, Marcel
On Tue, Feb 15, 2022 at 06:01:09PM +0100, Tobias Burnus wrote:
> OK?
Ok.
> Fortran/OpenMP: Fix depend-clause handling for c_ptr
>
> gcc/fortran/ChangeLog:
>
> * trans-openmp.cc (gfc_trans_omp_depobj): Fix to alloc/ptr dummy
> and for c_ptr.
>
> gcc/testsuite/ChangeLog:
>
> * gfortran.dg/gomp/depend-4.f90: Add VALUE test, update scan test.
> * gfortran.dg/gomp/depend-5.f90: Fix scan tree for -m32.
> * gfortran.dg/gomp/depend-6.f90: New test.
>
> gcc/fortran/trans-openmp.cc | 7 +-
> gcc/testsuite/gfortran.dg/gomp/depend-4.f90 | 29 +++-
> gcc/testsuite/gfortran.dg/gomp/depend-5.f90 | 12 +-
> gcc/testsuite/gfortran.dg/gomp/depend-6.f90 | 259 ++++++++++++++++++++++++++++
> 4 files changed, 295 insertions(+), 12 deletions(-)
Jakub
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-02-15 17:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-15 10:26 [Patch] Fortran/OpenMP: Fix depend-clause handling Tobias Burnus
2022-02-15 10:56 ` Jakub Jelinek
2022-02-15 17:01 ` [Patch] Fortran/OpenMP: Fix depend-clause handling for c_ptr (was: [Patch] Fortran/OpenMP: Fix depend-clause handling) Tobias Burnus
2022-02-15 17:36 ` Jakub Jelinek
2022-02-15 16:38 ` [Patch] Fortran/OpenMP: Fix depend-clause handling Thomas Schwinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).