[OG12,committed] Update dg-dump-scan for ... (was: [Patch] Fortran/OpenMP: Fix mapping of array descriptors and deferred-length strings)

[Tobias Burnus]

Hi Thomas,

On 25.02.23 10:11, Thomas Schwinge wrote:
> Do to the scan patterns need adjusting, or is something wrong?

The former. Regarding:

* gfortran.dg/goacc/finalize-1.f - for 'acc exit data':
     !$ACC EXIT DATA FINALIZE DELETE (del_f_p(2:5))

   Here, 'map\\(to:del_f_p [pointer set]' changed to 'map(release:del_f_p'
   By itself, this is handled identically in libgomp. However, there is also
   a 'finalize' - which change original-dump's 'release' to 'delete' in the
   gimple dump. 'delete' is handled differently in terms of the refcount.
   → I believe the patch actually fixed an OpenACC issue by also force-unmapping
   the descriptor and not only the pointer target.

* gfortran.dg/gomp/pr78260-2.f90
   Here, the '* 4' multiplication moved from the expression, shown in the 'to'
   clause to the expression evalulation.
   Reasons: To work properly with deferred-length strings (first, to take the
   current value and not some saved expr and to avoid issues when the var is
   unallocated - especially with absent 'optional' variables.)

Side remark: On OG12 there are too many FAIL, compared to mainline. That does
not have anything to do with the items above - but it still makes working
with OG12 harder. I hope that OG13 will have fewer fails.

Tobias

PS: --word-diff for 'finalize-1.f':
original: [-map\\(to:del_f_p \\\[pointer set, len:-]{+map\\(release:del_f_p \\\[len:+}
gimple: [-map\\(to:del_f_p \\\[pointer set, len:-]{+map\\(delete:del_f_p \\\[len:+}

and for pr78260-2.f90, the "len: " changed (twice) as in
   [-D.\[0-9\]+ \\* 4\\\]\\)-]{+D.\[0-9\]+\\\]\\)+}
and there is now additionally the following to ensure the '* 4' it not lost:
! { dg-final { scan-tree-dump-times "D\\.\[0-9\]+ = D\\.\[0-9\]+ \\* 4;" 2 "original" } }
-----------------
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: committed.diff
Type: text/x-patch
Size: 6276 bytes
Desc: not available
URL: <https://gcc.gnu.org/pipermail/fortran/attachments/20230227/ec8396f9/attachment.bin>