Fix lipo test cases with new pass names.
2011-06-07 David Li <davi...@google.com>
* testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_1.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/val-prof-1_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/val-prof-2_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/val-prof-3_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/val-prof-4_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/val-prof-5_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/val-prof-7_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/indir-call-prof-single_0.c: Pass name
fix.
* testsuite/gcc.dg/tree-prof/lipo/stringop-1_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_0.c: Pass name
fix.
* testsuite/gcc.dg/tree-prof/lipo/stringop-2_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/update-loopch_0.c: Pass name fix.
* testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_1.c: Pass name
fix.
* testsuite/g++.dg/tree-prof/lipo/vcall1_0.C: Pass name fix.
* testsuite/g++.dg/tree-prof/lipo/indir-call-prof_0.C: Pass name fix.
* testsuite/g++.dg/tree-prof/lipo/vcall1_1.C: Pass name fix.
* testsuite/g++.dg/tree-prof/lipo/vcall1_2.C: Pass name fix.
Index: testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
extern void setp (int (**pp) (void), int i);
@@ -17,7 +17,7 @@ main (void)
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* a1"
"tree_profile_ipa"} } */
+/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* a1"
"profile"} } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_1.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_1.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/indir-call-prof_1.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
int a1 (void)
{
Index: testsuite/gcc.dg/tree-prof/lipo/val-prof-1_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/val-prof-1_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/val-prof-1_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
int a[1000];
int b = 256;
int c = 257;
@@ -15,8 +15,8 @@ main ()
}
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Div.mod by constant n_\[0-9\]*=257
transformation on insn" "tree_profile_ipa"} } */
+/* { dg-final-use { scan-ipa-dump "Div.mod by constant n_\[0-9\]*=257
transformation on insn" "profile"} } */
/* { dg-final-use { scan-tree-dump "if \\(n_\[0-9\]* != 257\\)" "optimized"} }
*/
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/val-prof-2_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/val-prof-2_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/val-prof-2_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
unsigned int a[1000];
unsigned int b = 256;
unsigned int c = 1024;
@@ -23,10 +23,10 @@ main ()
}
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Mod power of 2 transformation on insn"
"tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump "Mod power of 2 transformation on insn"
"profile" } } */
/* This is part of code checking that n is power of 2, so we are sure that the
transformation
didn't get optimized out. */
/* { dg-final-use { scan-tree-dump "n_\[0-9\]* \\+ 0xffff" "optimized"} } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/val-prof-3_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/val-prof-3_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/val-prof-3_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
unsigned int a[1000];
unsigned int b = 257;
unsigned int c = 1023;
@@ -23,10 +23,10 @@ main ()
}
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Mod subtract transformation on insn"
"tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump "Mod subtract transformation on insn"
"profile" } } */
/* This is part of code checking that n is greater than the divisor so we are
sure that it
didn't get optimized out. */
/* { dg-final-use { scan-tree-dump "if \\(n_\[0-9\]* \\>" "optimized"} } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/val-prof-4_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/val-prof-4_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/val-prof-4_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
unsigned int a[1000];
unsigned int b = 999;
unsigned int c = 1002;
@@ -23,10 +23,10 @@ main ()
}
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Mod subtract transformation on insn"
"tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump "Mod subtract transformation on insn"
"profile" } } */
/* This is part of code checking that n is greater than the divisor so we are
sure that it
didn't get optimized out. */
/* { dg-final-use { scan-tree-dump "if \\(n_\[0-9\]* \\>" "optimized"} } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/val-prof-5_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/val-prof-5_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/val-prof-5_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
int a[1000];
int b=997;
main()
@@ -11,7 +11,7 @@ main()
a[i]/=b;
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Div.mod by constant b.*=997 transformation
on insn" "tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump "Div.mod by constant b.*=997 transformation
on insn" "profile" } } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/val-prof-7_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/val-prof-7_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/val-prof-7_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-ipa-tree_profile_ipa -mtune=core2" } */
+/* { dg-options "-O2 -fdump-ipa-profile -mtune=core2" } */
/* { dg-skip-if "" { ! { i?86-*-* x86_64-*-* } } { "*" } { "" } } */
#include <strings.h>
@@ -22,5 +22,5 @@ int main() {
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Single value 8 stringop transformation on
bzero" "tree_profile_ipa" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump "Single value 8 stringop transformation on
bzero" "profile" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/indir-call-prof-single_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/indir-call-prof-single_0.c (revision
174725)
+++ testsuite/gcc.dg/tree-prof/lipo/indir-call-prof-single_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
static int a1 (void)
{
@@ -37,7 +37,7 @@ main (void)
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* a1"
"tree_profile_ipa"} } */
+/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* a1"
"profile"} } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/stringop-1_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/stringop-1_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/stringop-1_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
int a[1000];
int b[1000];
int size=1;
@@ -13,10 +13,10 @@ main()
}
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Single value 4 stringop"
"tree_profile_ipa"} } */
+/* { dg-final-use { scan-ipa-dump "Single value 4 stringop" "profile"} } */
/* Really this ought to simplify into assignment, but we are not there yet. */
/* a[0] = b[0] is what we fold the resulting memcpy into. */
/* { dg-final-use { scan-tree-dump " = MEM.*&b" "optimized"} } */
/* { dg-final-use { scan-tree-dump "MEM.*&a\\\] = " "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_0.c (revision
174725)
+++ testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-ipa-profile" } */
extern void callee (void);
extern void caller (void (*func) (void));
@@ -15,5 +15,5 @@ main ()
return 0;
}
-/* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2
"tree_profile_ipa" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2
"profile" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/stringop-2_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/stringop-2_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/stringop-2_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
int a[1000];
int b[1000];
int size=1;
@@ -13,8 +13,8 @@ main()
}
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Single value 4 stringop"
"tree_profile_ipa"} } */
+/* { dg-final-use { scan-ipa-dump "Single value 4 stringop" "profile"} } */
/* The versioned memset of size 4 should be optimized to an assignment. */
/* { dg-final-use { scan-tree-dump "a\\\[0\\\] = 168430090" "optimized"} } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/update-loopch_0.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/update-loopch_0.c (revision 174725)
+++ testsuite/gcc.dg/tree-prof/lipo/update-loopch_0.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-ipa-tree_profile_ipa-blocks
-fdump-tree-optimized-blocks" } */
+/* { dg-options "-O2 -fdump-ipa-profile-blocks -fdump-tree-optimized-blocks" }
*/
int max = 33333;
int a[8];
int
@@ -14,8 +14,8 @@ main ()
/* Loop header copying will peel away the initial conditional, so the loop body
is once reached directly from entry point of function, rest via loopback
edge. */
-/* { dg-final-use { scan-ipa-dump "count:33333" "tree_profile_ipa"} } */
+/* { dg-final-use { scan-ipa-dump "count:33333" "profile"} } */
/* { dg-final-use { scan-tree-dump "count:33332" "optimized"} } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
Index: testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_1.c
===================================================================
--- testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_1.c (revision
174725)
+++ testsuite/gcc.dg/tree-prof/lipo/ic-misattribution-1_1.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-ipa-profile" } */
extern void other_caller (void);
@@ -14,5 +14,5 @@ caller(void (*func) (void))
func ();
}
-/* { dg-final-use { scan-ipa-dump "Indiret call -> direct call"
"tree_profile_ipa" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump "Indiret call -> direct call" "profile" } }
*/
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/g++.dg/tree-prof/lipo/vcall1_0.C
===================================================================
--- testsuite/g++.dg/tree-prof/lipo/vcall1_0.C (revision 174725)
+++ testsuite/g++.dg/tree-prof/lipo/vcall1_0.C (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
#include <stdio.h>
struct A {
A () {}
@@ -35,7 +35,7 @@ main (void)
printf ("result = %d\n",s);
}
-/* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2
"tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2
"profile" } } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized" } } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/g++.dg/tree-prof/lipo/indir-call-prof_0.C
===================================================================
--- testsuite/g++.dg/tree-prof/lipo/indir-call-prof_0.C (revision 174725)
+++ testsuite/g++.dg/tree-prof/lipo/indir-call-prof_0.C (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
struct A {
A () {}
@@ -33,7 +33,7 @@ main (void)
return 0;
}
-/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* AA "
"tree_profile_ipa" } } */
+/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* AA "
"profile" } } */
/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized" } } */
/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: testsuite/g++.dg/tree-prof/lipo/vcall1_1.C
===================================================================
--- testsuite/g++.dg/tree-prof/lipo/vcall1_1.C (revision 174725)
+++ testsuite/g++.dg/tree-prof/lipo/vcall1_1.C (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
struct A {
A () {}
Index: testsuite/g++.dg/tree-prof/lipo/vcall1_2.C
===================================================================
--- testsuite/g++.dg/tree-prof/lipo/vcall1_2.C (revision 174725)
+++ testsuite/g++.dg/tree-prof/lipo/vcall1_2.C (working copy)
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-tree_profile_ipa" } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-ipa-profile" } */
struct A {
A () {}
--
This patch is available for review at http://codereview.appspot.com/4528128
