Hi Tobias!
On 2020-11-11T09:25:25+0100, Tobias Burnus <tob...@codesourcery.com> wrote:
> As Sunil's regression tester pointed out, the testcases fail on x86-64 with
> -m32.
>
> The reason is that then the _ull_ variants of the GOMP functions are called;
> in the C equivalent, those are always called – I assume that's because the C
> testcase uses 'unsigned' which does not exist with Fortran.
>
> Committed as r11-4903-g1644ab9917ca6b96e9e683c422f1793258b9a3db
I'm confirming this fixes things for '-m32' -- but it also broke '-m64'.
;-)
Grüße
Thomas
> commit 1644ab9917ca6b96e9e683c422f1793258b9a3db
> Author: Tobias Burnus <tob...@codesourcery.com>
> Date: Wed Nov 11 09:23:07 2020 +0100
>
> gfortran.dg/gomp/workshare-reduction-*.f90: Fix dumps for -m32
>
> gcc/testsuite/ChangeLog:
>
> * gfortran.dg/gomp/workshare-reduction-26.f90: Add (?:_ull) to
> scan-tree-dump-times regex for -m32.
> * gfortran.dg/gomp/workshare-reduction-27.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-28.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-3.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-36.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-37.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-38.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-39.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-40.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-41.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-42.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-43.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-44.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-45.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-46.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-47.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-56.f90: Likewise.
> * gfortran.dg/gomp/workshare-reduction-57.f90: Likewise.
>
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90
> index 28267902914..d8633b66045 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 0,
> 0, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 0, 0, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_maybe_nonmonotonic_runtime_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_maybe_nonmonotonic_runtime_next " 1 "optimized"
> } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90
> index 2ee047d4e8c..aada4d7a23b 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*,
> (?:2147483648|-2147483648), 0, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, (?:2147483648|-2147483648), 0, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_runtime_next " 1
> "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_runtime_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90
> index 6c9d49be13c..e67e24b1aa2 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 4,
> 0, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 4, 0, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_runtime_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_runtime_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90
> index 6c9d49be13c..e67e24b1aa2 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 4,
> 0, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 4, 0, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_runtime_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_runtime_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90
> index b190e9ee87b..82dc063545e 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 2,
> 1, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 2, 1, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_dynamic_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90
> index c541d22d6cf..4fb64cf3133 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*,
> (?:2147483650|-2147483646), 1, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, (?:2147483650|-2147483646), 1, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_dynamic_next " 1
> "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_dynamic_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90
> index 46a27a0386c..08eaef082d5 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 2,
> 1, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 2, 1, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_dynamic_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90
> index 6cdd9a8807b..732753cac47 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 2,
> 3, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 2, 3, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_dynamic_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90
> index 29da27abc5a..44ecfa86f0f 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*,
> (?:2147483650|-2147483646), 3, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, (?:2147483650|-2147483646), 3, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_dynamic_next " 1
> "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_dynamic_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90
> index 4ed879cdd00..a8b99120c0d 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 2,
> 3, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 2, 3, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_dynamic_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90
> index 78d02ef8035..c6709e3f39e 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 3,
> 1, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 3, 1, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_guided_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90
> index 16885c84210..3cb0a661824 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*,
> (?:2147483651|-2147483645), 1, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, (?:2147483651|-2147483645), 1, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_guided_next " 1
> "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_guided_next
> " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90
> index 0db9be6854c..3a4867f8cf0 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 3,
> 1, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 3, 1, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_guided_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90
> index 40b12755414..1252ffc5980 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 3,
> 3, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 3, 3, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_guided_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90
> index 57c74023d8d..bf191984138 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*,
> (?:2147483651|-2147483645), 3, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, (?:2147483651|-2147483645), 3, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_guided_next " 1
> "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_guided_next
> " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90
> index b4564300b50..d2b03f6ec9b 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_start \[^\n\r]*, 3,
> 3, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
> \[^\n\r]*, 3, 3, " 1 "optimized" } }
> @@ -5 +5 @@
> -! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop_nonmonotonic_guided_next " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90
> index dc5ddafa0e5..fb6175c6172 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_doacross_start
> \[^\n\r]*, (?:2147483649|-2147483647), 0, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_doacross_start \[^\n\r]*,
> (?:2147483649|-2147483647), 0, " 1 "optimized" } }
> @@ -5,3 +5,3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross_post " 1
> "optimized" } }
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross_wait " 1
> "optimized" } }
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_static_next " 1
> "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_post "
> 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_wait "
> 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_static_next
> " 1 "optimized" } }
> diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90
> b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90
> index 80424882d2c..41b55eae786 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90
> @@ -3 +3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_doacross_start
> \[^\n\r]*, (?:2147483650|-2147483646), 1, " 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_doacross_start \[^\n\r]*,
> (?:2147483650|-2147483646), 1, " 1 "optimized" } }
> @@ -5,3 +5,3 @@
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross_post " 1
> "optimized" } }
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross_wait " 1
> "optimized" } }
> -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_dynamic_next " 1
> "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_post "
> 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_wait "
> 1 "optimized" } }
> +! { dg-final { scan-tree-dump-times
> "__builtin_GOMP_loop(?:_ull)_dynamic_next " 1 "optimized" } }
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander
Walter
