From 60bfc56c225f78a97c52cf451d3dfee088ff2615 Mon Sep 17 00:00:00 2001
From: mliska <mliska@suse.cz>
Date: Thu, 16 Jul 2015 14:09:01 +0200
Subject: [PATCH 2/2] Fix tree-ssa-tail-merge tests to scan corresponding dump
files.
gcc/testsuite/ChangeLog:
2015-07-20 Martin Liska <mliska@suse.cz>
* gcc.dg/pr43864-2.c: Change scanning of dump file to
a newly added -fdump-tree-tail-merge.
* gcc.dg/pr43864-3.c: Likewise.
* gcc.dg/pr43864-4.c (int f): Change statement order as
changes tree-tail merge passes cannot handle different order
of statements (as opposed to value numbering can).
* gcc.dg/pr43864.c: Likewise.
* gcc.dg/pr51879-16.c: Likewise.
* gcc.dg/pr51879-18.c: Likewise.
* gcc.dg/pr51879-2.c: Likewise.
* gcc.dg/pr51879-3.c: Likewise.
* gcc.dg/pr51879-6.c: Likewise.
* gcc.dg/pr51879-7.c: Likewise.
* gcc.dg/pr51879.c: Likewise.
* gcc.dg/tail-merge-store.c: Likewise.
---
gcc/testsuite/gcc.dg/pr43864-2.c | 8 ++++----
gcc/testsuite/gcc.dg/pr43864-3.c | 8 ++++----
gcc/testsuite/gcc.dg/pr43864-4.c | 12 ++++++------
gcc/testsuite/gcc.dg/pr43864.c | 6 +++---
gcc/testsuite/gcc.dg/pr51879-16.c | 6 +++---
gcc/testsuite/gcc.dg/pr51879-18.c | 4 ++--
gcc/testsuite/gcc.dg/pr51879-2.c | 6 +++---
gcc/testsuite/gcc.dg/pr51879-3.c | 4 ++--
gcc/testsuite/gcc.dg/pr51879-6.c | 4 ++--
gcc/testsuite/gcc.dg/pr51879-7.c | 4 ++--
gcc/testsuite/gcc.dg/pr51879.c | 4 ++--
gcc/testsuite/gcc.dg/tail-merge-store.c | 6 +++---
12 files changed, 36 insertions(+), 36 deletions(-)
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
int
f (int c, int b, int d)
@@ -17,6 +17,6 @@ f (int c, int b, int d)
return r;
}
-/* { dg-final { scan-tree-dump-times "if " 0 "pre"} } */
-/* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "pre"} } */
-/* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
+/* { dg-final { scan-tree-dump-times "if " 0 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-not "Invalid sum" "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
/* Commutative case. */
@@ -18,6 +18,6 @@ int f(int c, int b, int d)
return r;
}
-/* { dg-final { scan-tree-dump-times "if " 0 "pre"} } */
-/* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "pre"} } */
-/* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
+/* { dg-final { scan-tree-dump-times "if " 0 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-not "Invalid sum" "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
/* Different stmt order. */
@@ -14,15 +14,15 @@ int f(int c, int b, int d)
}
else
{
- r2 = d - b;
e = d + b;
+ r2 = d - b;
r = e;
}
return r - r2;
}
-/* { dg-final { scan-tree-dump-times "if " 0 "pre"} } */
-/* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "pre"} } */
-/* { dg-final { scan-tree-dump-times "(?n)_.*-.*_" 2 "pre"} } */
-/* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
+/* { dg-final { scan-tree-dump-times "if " 0 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-times "(?n)_.*-.*_" 2 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-not "Invalid sum" "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
extern void foo (char*, int);
extern void mysprintf (char *, char *);
@@ -31,5 +31,5 @@ hprofStartupp (char *outputFileName, char *ctx)
return ctx;
}
-/* { dg-final { scan-tree-dump-times "myfree \\(" 1 "pre"} } */
-/* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
+/* { dg-final { scan-tree-dump-times "myfree \\(" 1 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-not "Invalid sum" "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
struct S {
int i;
@@ -27,5 +27,5 @@ int bar (int c) {
return r;
}
-/* { dg-final { scan-tree-dump-times "foo \\(" 1 "pre"} } */
-/* { dg-final { scan-tree-dump-times "foo2 \\(" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "foo \\(" 1 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-times "foo2 \\(" 1 "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre -fno-tree-copy-prop -fno-tree-dominator-opts -fno-tree-copyrename" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge -fno-tree-copy-prop -fno-tree-dominator-opts -fno-tree-copyrename" } */
extern int foo (void);
@@ -13,4 +13,4 @@ void bar (int c, int *p)
*q = foo ();
}
-/* { dg-final { scan-tree-dump-times "foo \\(" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "foo \\(" 1 "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
int bar (int);
void baz (int);
@@ -14,5 +14,5 @@ foo (int y)
baz (bar (7) + 6);
}
-/* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
-/* { dg-final { scan-tree-dump-times "baz \\(" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "bar \\(" 1 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-times "baz \\(" 1 "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
int bar (int);
void baz (int);
@@ -15,4 +15,4 @@ foo (int y)
baz (a);
}
-/* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "bar \\(" 1 "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
int bar (int);
@@ -23,4 +23,4 @@ foo (int y)
baz (a);
}
-/* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "bar \\(" 1 "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
int z;
@@ -12,4 +12,4 @@ foo (int y)
z = 5;
}
-/* { dg-final { scan-tree-dump-times "z = 5" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "z = 5" 1 "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
int bar (int);
void baz (int);
@@ -15,4 +15,4 @@ foo (int y)
baz (a);
}
-/* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "bar \\(" 1 "tail-merge"} } */
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-tail-merge" } */
int z;
int x;
@@ -17,5 +17,5 @@ f (int c, int d)
}
}
-/* { dg-final { scan-tree-dump-times "duplicate of" 1 "pre"} } */
-/* { dg-final { scan-tree-dump-times "z = 5" 1 "pre"} } */
+/* { dg-final { scan-tree-dump-times "duplicate of" 1 "tail-merge"} } */
+/* { dg-final { scan-tree-dump-times "z = 5" 1 "tail-merge"} } */
--
2.4.5