On Wed, Nov 11, 2020 at 02:40:20PM +0100, Thomas Schwinge wrote:
> 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'.
> ;-)
The added (?:_ull) match on 32-bit targets, but are equivalent to just
adding _ull into the strings, i.e. require the _ull substrings, while
the intent is that they are optional, so we should use (?:_ull)? instead.
Tested on x86_64-linux with -m32/-m64, committed to trunk.
2020-11-11 Jakub Jelinek <ja...@redhat.com>
* gfortran.dg/gomp/workshare-reduction-3.f90: Use (?:_ull)? instead
of (?:_ull) in the scan-tree-dump-times directives.
* gfortran.dg/gomp/workshare-reduction-26.f90: Likewise.
* gfortran.dg/gomp/workshare-reduction-27.f90: Likewise.
* gfortran.dg/gomp/workshare-reduction-28.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.
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90 2020-11-11
16:08:18.865674174 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 0, 0, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 0, 0, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_maybe_nonmonotonic_runtime_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_maybe_nonmonotonic_runtime_next " 1 "optimized" }
}
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90 2020-11-11
16:08:18.871674108 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 4, 0, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 4, 0, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_runtime_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_runtime_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90 2020-11-11
16:08:18.895673844 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 3, 1, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 3, 1, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90 2020-11-11
16:08:18.907673712 +0100
@@ -1,10 +1,10 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_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" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 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" } }
+! { 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" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90 2020-11-11
16:08:18.893673866 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_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" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_guided_next "
1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_guided_next
" 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90 2020-11-11
16:08:18.904673745 +0100
@@ -1,10 +1,10 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_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" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 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" } }
+! { 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" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90 2020-11-11
16:08:18.881673998 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 2, 3, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 2, 3, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90 2020-11-11
16:08:18.873674086 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 2, 1, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 2, 1, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90 2020-11-11
16:08:18.902673767 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 3, 3, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 3, 3, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90 2020-11-11
16:08:18.878674031 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 2, 1, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 2, 1, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90 2020-11-11
16:08:18.900673789 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_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" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_guided_next "
1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_guided_next
" 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90 2020-11-11
16:08:18.868674141 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_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" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_runtime_next
" 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_runtime_next
" 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90 2020-11-11
16:08:18.885673954 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_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" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_dynamic_next
" 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_dynamic_next
" 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90 2020-11-11
16:08:18.876674053 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_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" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_dynamic_next
" 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_dynamic_next
" 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90 2020-11-11
16:08:18.888673921 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 2, 3, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 2, 3, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90 2020-11-11
16:08:18.890673899 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 3, 1, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 3, 1, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90.jj
2020-11-11 14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90 2020-11-11
16:08:18.898673811 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 3, 3, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 3, 3, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
--- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90.jj 2020-11-11
14:11:07.924006064 +0100
+++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90 2020-11-11
16:08:18.883673976 +0100
@@ -1,8 +1,8 @@
! { dg-do compile }
! { dg-options "-O2 -fopenmp -fdump-tree-optimized" }
-! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start
\[^\n\r]*, 4, 0, " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start
\[^\n\r]*, 4, 0, " 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" }
}
-! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)_nonmonotonic_runtime_next " 1 "optimized" } }
+! { dg-final { scan-tree-dump-times
"__builtin_GOMP_loop(?:_ull)?_nonmonotonic_runtime_next " 1 "optimized" } }
! { dg-final { scan-tree-dump-times
"__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } }
! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" }
}
Jakub
