[gcc(refs/users/marxin/heads/loop-unswitch-improvement-v7)] Fix test-cases.

[Martin Liska]

https://gcc.gnu.org/g:ea706f21a4839306c48b0ebf242d93d103e5a503

commit ea706f21a4839306c48b0ebf242d93d103e5a503
Author: Martin Liska <mliska@suse.cz>
Date:   Tue Dec 7 17:49:01 2021 +0100

    Fix test-cases.

Diff:
---
 gcc/testsuite/gcc.dg/loop-unswitch-10.c                      | 10 +++++-----
 gcc/testsuite/gcc.dg/loop-unswitch-11.c                      | 10 +++++-----
 gcc/testsuite/gcc.dg/loop-unswitch-12.c                      |  4 ++--
 gcc/testsuite/gcc.dg/loop-unswitch-13.c                      |  4 ++--
 .../gcc.dg/{loop-unswitch-15.c => loop-unswitch-6.c}         | 12 ++++++------
 .../gcc.dg/{loop-unswitch-14.c => loop-unswitch-7.c}         |  4 ++--
 gcc/testsuite/gcc.dg/loop-unswitch-8.c                       |  4 ++--
 gcc/testsuite/gcc.dg/loop-unswitch-9.c                       |  4 ++--
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-10.c b/gcc/testsuite/gcc.dg/loop-unswitch-10.c
index c3c940a1f80..2ab196b527f 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-10.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized" } */
 
 int
 __attribute__((noipa))
@@ -50,7 +50,7 @@ int main()
 
 
 /* Test that we actually unswitched something.  */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 0" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 2" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 3" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 0" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 2" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 3" 1 "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-11.c b/gcc/testsuite/gcc.dg/loop-unswitch-11.c
index 85173bd6b64..310e4f40423 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-11.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized" } */
 
 int
 foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
@@ -39,7 +39,7 @@ foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order_.* >= 5 & order_.* <= 6 \\| order_.* == 9" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 2" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 3" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order_.* >= 5 & order_.* <= 6 \\| order_.* == 9" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 2" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 3" 1 "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-12.c b/gcc/testsuite/gcc.dg/loop-unswitch-12.c
index c99afe0e61c..adf0cdae7a8 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-12.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized" } */
 
 int
 foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
@@ -25,4 +25,4 @@ foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-13.c b/gcc/testsuite/gcc.dg/loop-unswitch-13.c
index df092b668d6..db59b881247 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-13.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-13.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized" } */
 
 int
 foo(double *a, double *b, double *c, double *d, double *r, int size, unsigned order)
@@ -31,4 +31,4 @@ foo(double *a, double *b, double *c, double *d, double *r, int size, unsigned or
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* <= 4" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* <= 4" 1 "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-15.c b/gcc/testsuite/gcc.dg/loop-unswitch-6.c
similarity index 62%
rename from gcc/testsuite/gcc.dg/loop-unswitch-15.c
rename to gcc/testsuite/gcc.dg/loop-unswitch-6.c
index 406611cd28a..ccf3c0f8978 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-15.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details --param=max-unswitch-insns=1000" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized --param=max-unswitch-insns=1000" } */
 
 int
 __attribute__((noipa))
@@ -53,8 +53,8 @@ int main()
 
 
 /* Test that we actually unswitched something.  */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* <= 0" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 0" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 2" 1 "unswitch" } } */
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 3" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* <= 0" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 0" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 1" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 2" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 3" 1 "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-14.c b/gcc/testsuite/gcc.dg/loop-unswitch-7.c
similarity index 68%
rename from gcc/testsuite/gcc.dg/loop-unswitch-14.c
rename to gcc/testsuite/gcc.dg/loop-unswitch-7.c
index 92e5cef5916..19282cd731b 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-14.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-7.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized" } */
 
 int
 foo(double *a, double *b, double *c, double *d, double *r, int size, float order)
@@ -25,4 +25,4 @@ foo(double *a, double *b, double *c, double *d, double *r, int size, float order
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order.* == 1.0e" 1 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order.* == 1.0e" 1 "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-8.c b/gcc/testsuite/gcc.dg/loop-unswitch-8.c
index ae5f8f300e9..a08fd813dfb 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-8.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized" } */
 
 int
 foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
@@ -28,4 +28,4 @@ foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order" 3 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order" 3 "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-unswitch-9.c b/gcc/testsuite/gcc.dg/loop-unswitch-9.c
index 9dd6023d49d..2c9fb31c7b9 100644
--- a/gcc/testsuite/gcc.dg/loop-unswitch-9.c
+++ b/gcc/testsuite/gcc.dg/loop-unswitch-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-details" } */
+/* { dg-options "-O2 -funswitch-loops -fdump-tree-unswitch-optimized" } */
 
 int
 foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
@@ -24,4 +24,4 @@ foo(double *a, double *b, double *c, double *d, double *r, int size, int order)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times ";; Unswitching loop on condition: order" 2 "unswitch" } } */
+/* { dg-final { scan-tree-dump-times "Unswitching loop on condition: order" 2 "unswitch" } } */