public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-12] gcc/testsuite: Change 'cunrolli' to 'cunrolli1' in dump scan + options
@ 2022-10-24 15:16 Tobias Burnus
0 siblings, 0 replies; only message in thread
From: Tobias Burnus @ 2022-10-24 15:16 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:a96959b7382bdf4bcef5c6afc43bb60f9af544a9
commit a96959b7382bdf4bcef5c6afc43bb60f9af544a9
Author: Tobias Burnus <tobias@codesourcery.com>
Date: Mon Oct 24 16:50:25 2022 +0200
gcc/testsuite: Change 'cunrolli' to 'cunrolli1' in dump scan + options
The OG12 commit
3e8b51d143e openacc: Move pass_oacc_device_lower after pass_graphite
adds a new pass, which also re-invokes some previous passes. This
seems to have the effect that the pass names and, hence, the dump
names have now a tailing number.
In that commit, 'cunrolli' was changed to 'cunrolli1 for some testcases.
This commit does likewise for some more testcases. In particular,
. in scan-tree-dump the tailing '1' is crucial to change UNRESOLVED
to PASS.
. for "-fdisable-tree-cunrolli1" option, it changes FAIL (excess errors)
to PASS
. even without the change, "-fdump-tree-cunrolli{-details,-optimized}"
has PASS, but I believe the tailing 1 ensures that only the first
'cunrolli' dumps.
gcc/testsuite
* g++.dg/ext/unroll-1.C: Change 'cunrolli' to 'cunrolli1' in
dg-options and scan-tree-dump.
* g++.dg/ext/unroll-2.C: Likewise.
* g++.dg/ext/unroll-3.C: Likewise.
* g++.dg/vect/pr36648.cc: Likewise.
* gcc.dg/tree-prof/init-array.c: Likewise.
* gcc.dg/tree-ssa/pr100359.c: Likewise.
* gcc.dg/tree-ssa/pr59597.c: Likewise.
* gcc.dg/unroll-2.c: Likewise.
* gfortran.dg/directive_unroll_1.f90: Likewise.
* gfortran.dg/directive_unroll_4.f90: Likewise.
* gnat.dg/unroll1.adb: Likewise.
* gnat.dg/unroll2.adb: Likewise.
Diff:
---
gcc/testsuite/ChangeLog.omp | 16 ++++++++++++++++
gcc/testsuite/g++.dg/ext/unroll-1.C | 4 ++--
gcc/testsuite/g++.dg/ext/unroll-2.C | 4 ++--
gcc/testsuite/g++.dg/ext/unroll-3.C | 4 ++--
gcc/testsuite/g++.dg/vect/pr36648.cc | 2 +-
gcc/testsuite/gcc.dg/tree-prof/init-array.c | 4 ++--
gcc/testsuite/gcc.dg/tree-ssa/pr100359.c | 6 +++---
gcc/testsuite/gcc.dg/tree-ssa/pr59597.c | 2 +-
gcc/testsuite/gcc.dg/unroll-2.c | 4 ++--
gcc/testsuite/gfortran.dg/directive_unroll_1.f90 | 4 ++--
gcc/testsuite/gfortran.dg/directive_unroll_4.f90 | 4 ++--
gcc/testsuite/gnat.dg/unroll1.adb | 2 +-
gcc/testsuite/gnat.dg/unroll2.adb | 2 +-
13 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 5970a3baf7b..677a4c6ee12 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,19 @@
+2022-10-24 Tobias Burnus <tobias@codesourcery.com>
+
+ * g++.dg/ext/unroll-1.C: Change 'cunrolli' to 'cunrolli1' in
+ dg-options and scan-tree-dump.
+ * g++.dg/ext/unroll-2.C: Likewise.
+ * g++.dg/ext/unroll-3.C: Likewise.
+ * g++.dg/vect/pr36648.cc: Likewise.
+ * gcc.dg/tree-prof/init-array.c: Likewise.
+ * gcc.dg/tree-ssa/pr100359.c: Likewise.
+ * gcc.dg/tree-ssa/pr59597.c: Likewise.
+ * gcc.dg/unroll-2.c: Likewise.
+ * gfortran.dg/directive_unroll_1.f90: Likewise.
+ * gfortran.dg/directive_unroll_4.f90: Likewise.
+ * gnat.dg/unroll1.adb: Likewise.
+ * gnat.dg/unroll2.adb: Likewise.
+
2022-10-24 Tobias Burnus <tobias@codesourcery.com>
Backported from master:
diff --git a/gcc/testsuite/g++.dg/ext/unroll-1.C b/gcc/testsuite/g++.dg/ext/unroll-1.C
index aa11b2e6ef7..6c827091da8 100644
--- a/gcc/testsuite/g++.dg/ext/unroll-1.C
+++ b/gcc/testsuite/g++.dg/ext/unroll-1.C
@@ -1,5 +1,5 @@
// { dg-do compile }
-// { dg-options "-O2 -fdump-tree-cunrolli-details" }
+// { dg-options "-O2 -fdump-tree-cunrolli1-details" }
template <typename T>
void
@@ -16,4 +16,4 @@ bar (int *a, int *b, int *c)
foo <int> (a, b, c);
}
-// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli" } }
+// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli1" } }
diff --git a/gcc/testsuite/g++.dg/ext/unroll-2.C b/gcc/testsuite/g++.dg/ext/unroll-2.C
index f9ec892dbdd..f196a7e8d76 100644
--- a/gcc/testsuite/g++.dg/ext/unroll-2.C
+++ b/gcc/testsuite/g++.dg/ext/unroll-2.C
@@ -1,5 +1,5 @@
// { dg-do compile }
-// { dg-options "-O2 -fdump-tree-cunrolli-details" }
+// { dg-options "-O2 -fdump-tree-cunrolli1-details" }
// { dg-skip-if "range for" { *-*-* } { "-std=gnu++98" } { "" } }
void
@@ -10,4 +10,4 @@ foo (int (&a)[8], int *b, int *c)
a[i] = b[i] * c[i];
}
-// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli" } }
+// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli1" } }
diff --git a/gcc/testsuite/g++.dg/ext/unroll-3.C b/gcc/testsuite/g++.dg/ext/unroll-3.C
index dda94c56af2..26e7f356995 100644
--- a/gcc/testsuite/g++.dg/ext/unroll-3.C
+++ b/gcc/testsuite/g++.dg/ext/unroll-3.C
@@ -1,5 +1,5 @@
// { dg-do compile }
-// { dg-options "-O2 -fdump-tree-cunrolli-details" }
+// { dg-options "-O2 -fdump-tree-cunrolli1-details" }
// { dg-skip-if "range for" { *-*-* } { "-std=gnu++98" } { "" } }
template <typename T>
@@ -17,4 +17,4 @@ bar (int (&a)[8], int *b, int *c)
foo <int> (a, b, c);
}
-// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli" } }
+// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli1" } }
diff --git a/gcc/testsuite/g++.dg/vect/pr36648.cc b/gcc/testsuite/g++.dg/vect/pr36648.cc
index 8d24d3d445d..8990041e4fa 100644
--- a/gcc/testsuite/g++.dg/vect/pr36648.cc
+++ b/gcc/testsuite/g++.dg/vect/pr36648.cc
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_float } */
-/* { dg-additional-options "-fdisable-tree-cunrolli" } */
+/* { dg-additional-options "-fdisable-tree-cunrolli1" } */
struct vector
{
diff --git a/gcc/testsuite/gcc.dg/tree-prof/init-array.c b/gcc/testsuite/gcc.dg/tree-prof/init-array.c
index 0f7a5c84481..1999792e70c 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/init-array.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/init-array.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O3 -fdump-tree-cunrolli-details" } */
+/* { dg-options "-O3 -fdump-tree-cunrolli1-details" } */
static int s[10][10][10];
static int d[10][10][10];
@@ -40,4 +40,4 @@ int main(int argc, char *argv[])
}
}
-/* { dg-final-use { scan-tree-dump-times "loop with 10 iterations completely unrolled" 2 "cunrolli"} } */
+/* { dg-final-use { scan-tree-dump-times "loop with 10 iterations completely unrolled" 2 "cunrolli1"} } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr100359.c b/gcc/testsuite/gcc.dg/tree-ssa/pr100359.c
index 29243522caa..6d5e78560b1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr100359.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr100359.c
@@ -1,5 +1,5 @@
/* { dg-do link } */
-/* { dg-options "-O3 -fdump-tree-cunrolli-optimized" } */
+/* { dg-options "-O3 -fdump-tree-cunrolli1-optimized" } */
extern void foo(void);
static int b, f, *a = &b;
@@ -27,5 +27,5 @@ int main() {
}
/* Verify that we unroll the inner loop early even with -O3. */
-/* { dg-final { scan-tree-dump "loop with 1 iterations completely unrolled" "cunrolli" } } */
-/* { dg-final { scan-tree-dump "loop with 3 iterations completely unrolled" "cunrolli" } } */
+/* { dg-final { scan-tree-dump "loop with 1 iterations completely unrolled" "cunrolli1" } } */
+/* { dg-final { scan-tree-dump "loop with 3 iterations completely unrolled" "cunrolli1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c b/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c
index 0f66aae87bb..98d639bc24d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-Ofast -fdisable-tree-cunrolli -fdump-tree-threadfull1-details" } */
+/* { dg-options "-Ofast -fdisable-tree-cunrolli1 -fdump-tree-threadfull1-details" } */
typedef unsigned short u16;
typedef unsigned char u8;
diff --git a/gcc/testsuite/gcc.dg/unroll-2.c b/gcc/testsuite/gcc.dg/unroll-2.c
index f94174f0f1d..541ad7133ae 100644
--- a/gcc/testsuite/gcc.dg/unroll-2.c
+++ b/gcc/testsuite/gcc.dg/unroll-2.c
@@ -1,8 +1,8 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-cunrolli-details=stderr -fno-peel-loops -fno-tree-vrp -fdisable-tree-cunroll -fenable-tree-cunrolli1" } */
+/* { dg-options "-O2 -fdump-tree-cunrolli1-details=stderr -fno-peel-loops -fno-tree-vrp -fdisable-tree-cunroll -fenable-tree-cunrolli1" } */
/* Blank lines can occur in the output of
- -fdump-tree-cunrolli-details=stderr. */
+ -fdump-tree-cunrolli1-details=stderr. */
/* { dg-allow-blank-lines-in-output 1 } */
unsigned a[100], b[100];
diff --git a/gcc/testsuite/gfortran.dg/directive_unroll_1.f90 b/gcc/testsuite/gfortran.dg/directive_unroll_1.f90
index d758ad74395..38a6aaf2933 100644
--- a/gcc/testsuite/gfortran.dg/directive_unroll_1.f90
+++ b/gcc/testsuite/gfortran.dg/directive_unroll_1.f90
@@ -1,5 +1,5 @@
! { dg-do compile }
-! { dg-options "-O2 -fdump-tree-cunrolli-details -fdump-rtl-loop2_unroll-details" }
+! { dg-options "-O2 -fdump-tree-cunrolli1-details -fdump-rtl-loop2_unroll-details" }
! Test that
! #pragma GCC unroll n
! works
@@ -12,7 +12,7 @@ subroutine test1(a)
DO i=1, 8, 1
call dummy(a(i))
ENDDO
-! { dg-final { scan-tree-dump "12:.*: loop with 8 iterations completely unrolled" "cunrolli" } } */
+! { dg-final { scan-tree-dump "12:.*: loop with 8 iterations completely unrolled" "cunrolli1" } } */
end subroutine test1
subroutine test2(a, n)
diff --git a/gcc/testsuite/gfortran.dg/directive_unroll_4.f90 b/gcc/testsuite/gfortran.dg/directive_unroll_4.f90
index fbb5f24e76f..0371e3568ce 100644
--- a/gcc/testsuite/gfortran.dg/directive_unroll_4.f90
+++ b/gcc/testsuite/gfortran.dg/directive_unroll_4.f90
@@ -1,5 +1,5 @@
! { dg-do compile }
-! { dg-options "-O2 -funroll-all-loops -fdump-rtl-loop2_unroll-details -fdump-tree-cunrolli-details" }
+! { dg-options "-O2 -funroll-all-loops -fdump-rtl-loop2_unroll-details -fdump-tree-cunrolli1-details" }
! Test that
! #pragma GCC unroll n
! works
@@ -25,5 +25,5 @@ subroutine test2(a, n)
ENDDO
end subroutine test2
-! { dg-final { scan-tree-dump "Not unrolling loop .: user didn't want it unrolled completely" "cunrolli" } } */
+! { dg-final { scan-tree-dump "Not unrolling loop .: user didn't want it unrolled completely" "cunrolli1" } } */
! { dg-final { scan-rtl-dump-times "Not unrolling loop, user didn't want it unrolled" 2 "loop2_unroll" } } */
diff --git a/gcc/testsuite/gnat.dg/unroll1.adb b/gcc/testsuite/gnat.dg/unroll1.adb
index 8b732dd8f44..c762f025f59 100644
--- a/gcc/testsuite/gnat.dg/unroll1.adb
+++ b/gcc/testsuite/gnat.dg/unroll1.adb
@@ -23,5 +23,5 @@ package body Unroll1 is
end Unroll1;
--- { dg-final { scan-tree-dump-times "Not unrolling loop .: user didn't want it unrolled completely" 2 "cunrolli" } }
+-- { dg-final { scan-tree-dump-times "Not unrolling loop .: user didn't want it unrolled completely" 2 "cunrolli1" } }
-- { dg-final { scan-rtl-dump-times "Not unrolling loop, user didn't want it unrolled" 2 "loop2_unroll" } }
diff --git a/gcc/testsuite/gnat.dg/unroll2.adb b/gcc/testsuite/gnat.dg/unroll2.adb
index 1d3a75706de..13f05283f64 100644
--- a/gcc/testsuite/gnat.dg/unroll2.adb
+++ b/gcc/testsuite/gnat.dg/unroll2.adb
@@ -23,4 +23,4 @@ package body Unroll2 is
end Unroll2;
--- { dg-final { scan-tree-dump-times "loop with 3 iterations completely unrolled" 2 "cunrolli" } }
+-- { dg-final { scan-tree-dump-times "loop with 3 iterations completely unrolled" 2 "cunrolli1" } }
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-24 15:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-24 15:16 [gcc/devel/omp/gcc-12] gcc/testsuite: Change 'cunrolli' to 'cunrolli1' in dump scan + options Tobias Burnus
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).