From 855c9b82d9f32bf7d2d2662e767f912521aa6921 Mon Sep 17 00:00:00 2001 From: davidxl Date: Wed, 1 Jun 2011 17:45:26 +0000 Subject: [PATCH] Pass name cleanups git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174537 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/dce.c | 4 ++-- gcc/except.c | 2 +- gcc/ipa.c | 2 +- gcc/predict.c | 2 +- gcc/testsuite/ChangeLog | 21 +++++++++++++++++++++ gcc/testsuite/g++.dg/tree-prof/indir-call-prof.C | 6 +++--- gcc/testsuite/gcc.dg/profile-dir-1.c | 6 +++--- gcc/testsuite/gcc.dg/profile-dir-2.c | 6 +++--- gcc/testsuite/gcc.dg/profile-dir-3.c | 6 +++--- .../gcc.dg/tree-prof/ic-misattribution-1.c | 6 +++--- .../gcc.dg/tree-prof/ic-misattribution-1a.c | 2 +- gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/stringop-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/stringop-2.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/update-loopch.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c | 6 +++--- gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/dump-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-25.c | 16 ++++++++-------- gcc/tree-profile.c | 2 +- 25 files changed, 91 insertions(+), 62 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 363c655a73a..e476e6b991b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2011-06-01 David Li + * predict.c : Change pass name + * ipa.c: Ditto. + * dce.c: Ditto. + * tree-profile.c: Ditto. + * except.c: Ditto. + +2011-06-01 David Li + * tree-pretty-print.c (dump_function_header): New function. * final.c (rest_of_clean_state): Use header dumper. * tree-cfg.c (gimple_dump_cfg): Use header dumper. diff --git a/gcc/dce.c b/gcc/dce.c index f63d09e4164..ec54c6681b8 100644 --- a/gcc/dce.c +++ b/gcc/dce.c @@ -734,7 +734,7 @@ struct rtl_opt_pass pass_ud_rtl_dce = { { RTL_PASS, - "ud dce", /* name */ + "ud_dce", /* name */ gate_ud_dce, /* gate */ rest_of_handle_ud_dce, /* execute */ NULL, /* sub */ @@ -1086,7 +1086,7 @@ struct rtl_opt_pass pass_fast_rtl_dce = { { RTL_PASS, - "rtl dce", /* name */ + "rtl_dce", /* name */ gate_fast_dce, /* gate */ rest_of_handle_fast_dce, /* execute */ NULL, /* sub */ diff --git a/gcc/except.c b/gcc/except.c index 9578e2e907f..1e5c291055f 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -1457,7 +1457,7 @@ struct rtl_opt_pass pass_rtl_eh = { { RTL_PASS, - "rtl eh", /* name */ + "rtl_eh", /* name */ gate_handle_eh, /* gate */ rest_of_handle_eh, /* execute */ NULL, /* sub */ diff --git a/gcc/ipa.c b/gcc/ipa.c index 0ac325b5d0f..f40c0aa2efb 100644 --- a/gcc/ipa.c +++ b/gcc/ipa.c @@ -1145,7 +1145,7 @@ struct ipa_opt_pass_d pass_ipa_profile = { { IPA_PASS, - "ipa-profile", /* name */ + "profile_estimate", /* name */ gate_ipa_profile, /* gate */ ipa_profile, /* execute */ NULL, /* sub */ diff --git a/gcc/predict.c b/gcc/predict.c index e18f9379c3f..870526bc6b3 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -2306,7 +2306,7 @@ struct gimple_opt_pass pass_profile = { { GIMPLE_PASS, - "profile", /* name */ + "profile_estimate", /* name */ gate_estimate_probability, /* gate */ tree_estimate_probability_driver, /* execute */ NULL, /* sub */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3a0371bb486..07ab924759f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,24 @@ +2011-06-01 David Li + + * testsuite/gcc.dg/profile-dir-1.c: Change pass name. + * testsuite/gcc.dg/profile-dir-2.c: Ditto. + * testsuite/gcc.dg/tree-ssa/dump-1.c: Ditto. + * testsuite/gcc.dg/tree-ssa/loop-25.c: Ditto. + * testsuite/gcc.dg/tree-prof/stringop-1.c: Ditto. + * testsuite/gcc.dg/tree-prof/update-loopch.c: Ditto. + * testsuite/gcc.dg/tree-prof/stringop-2.c: Ditto. + * testsuite/gcc.dg/tree-prof/ic-misattribution-1.c: Ditto. + * testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c: Ditto. + * testsuite/gcc.dg/tree-prof/indir-call-prof.c: Ditto. + * testsuite/gcc.dg/tree-prof/val-prof-1.c: Ditto. + * testsuite/gcc.dg/tree-prof/val-prof-2.c: Ditto. + * testsuite/gcc.dg/tree-prof/val-prof-3.c: Ditto. + * testsuite/gcc.dg/tree-prof/val-prof-4.c: Ditto. + * testsuite/gcc.dg/tree-prof/val-prof-5.c: Ditto. + * testsuite/gcc.dg/tree-prof/val-prof-7.c: Ditto. + * testsuite/gcc.dg/profile-dir-3.c: Ditto. + * testsuite/g++.dg/tree-prof/indir-call-prof.C: Ditto. + 2011-06-01 Nicola Pero * objc.dg/attributes/method-nonnull-1.m: New test. diff --git a/gcc/testsuite/g++.dg/tree-prof/indir-call-prof.C b/gcc/testsuite/g++.dg/tree-prof/indir-call-prof.C index 80b41865c0c..91874a30e04 100644 --- a/gcc/testsuite/g++.dg/tree-prof/indir-call-prof.C +++ b/gcc/testsuite/g++.dg/tree-prof/indir-call-prof.C @@ -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 transformation on insn" "tree_profile_ipa" } } */ +/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* AA 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" } } */ diff --git a/gcc/testsuite/gcc.dg/profile-dir-1.c b/gcc/testsuite/gcc.dg/profile-dir-1.c index 62f31303142..97763721abc 100644 --- a/gcc/testsuite/gcc.dg/profile-dir-1.c +++ b/gcc/testsuite/gcc.dg/profile-dir-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-O -fprofile-generate=. -fdump-ipa-tree_profile_ipa" } */ -/* { dg-final { scan-ipa-dump " ./profile-dir-1.gcda" "tree_profile_ipa" } } */ +/* { dg-options "-O -fprofile-generate=. -fdump-ipa-profile" } */ +/* { dg-final { scan-ipa-dump " ./profile-dir-1.gcda" "profile" } } */ int main(void) @@ -8,4 +8,4 @@ main(void) return 0; } -/* { dg-final { cleanup-ipa-dump "tree_profile_ipa" } } */ +/* { dg-final { cleanup-ipa-dump "profile" } } */ diff --git a/gcc/testsuite/gcc.dg/profile-dir-2.c b/gcc/testsuite/gcc.dg/profile-dir-2.c index 7bad03c5c04..d49dcc37605 100644 --- a/gcc/testsuite/gcc.dg/profile-dir-2.c +++ b/gcc/testsuite/gcc.dg/profile-dir-2.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-O -fprofile-generate -fdump-ipa-tree_profile_ipa" } */ -/* { dg-final { scan-ipa-dump "/profile-dir-2.gcda" "tree_profile_ipa" } } */ +/* { dg-options "-O -fprofile-generate -fdump-ipa-profile" } */ +/* { dg-final { scan-ipa-dump "/profile-dir-2.gcda" "profile" } } */ int main(void) @@ -8,4 +8,4 @@ main(void) return 0; } -/* { dg-final { cleanup-ipa-dump "tree_profile_ipa" } } */ +/* { dg-final { cleanup-ipa-dump "profile" } } */ diff --git a/gcc/testsuite/gcc.dg/profile-dir-3.c b/gcc/testsuite/gcc.dg/profile-dir-3.c index a4622233dc7..0ae329d4698 100644 --- a/gcc/testsuite/gcc.dg/profile-dir-3.c +++ b/gcc/testsuite/gcc.dg/profile-dir-3.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-O -fprofile-generate -fprofile-dir=. -fdump-ipa-tree_profile_ipa" } */ -/* { dg-final { scan-ipa-dump " ./profile-dir-3.gcda" "tree_profile_ipa" } } */ +/* { dg-options "-O -fprofile-generate -fprofile-dir=. -fdump-ipa-profile" } */ +/* { dg-final { scan-ipa-dump " ./profile-dir-3.gcda" "profile" } } */ int main(void) @@ -8,4 +8,4 @@ main(void) return 0; } -/* { dg-final { cleanup-ipa-dump "tree_profile_ipa" } } */ +/* { dg-final { cleanup-ipa-dump "profile" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c index 94a5953c9f2..e9f3a418dca 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c +++ b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c @@ -1,4 +1,4 @@ -/* { dg-options "-O2 -fdump-ipa-tree_profile_ipa" } */ +/* { dg-options "-O2 -fdump-ipa-profile" } */ /* { dg-additional-sources "ic-misattribution-1a.c" } */ extern void other_caller (void); @@ -15,5 +15,5 @@ caller(void (*func) (void)) func (); } -/* { dg-final-use { scan-ipa-dump "hist->count 1 hist->all 1" "tree_profile_ipa" } } */ -/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */ +/* { dg-final-use { scan-ipa-dump "hist->count 1 hist->all 1" "profile" } } */ +/* { dg-final-use { cleanup-ipa-dump "profile" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c index caa10fec52f..fa9d6e70522 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c +++ b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c @@ -19,4 +19,4 @@ main () return 0; } -/* { dg-final-use { cleanup-ipa-dump "tree_profile_ipa" } } */ +/* { dg-final-use { cleanup-ipa-dump "profile" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c b/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c index 8f7508b4960..df7481f4daf 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c +++ b/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c @@ -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 transformation on insn" "tree_profile_ipa"} } */ +/* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* a1 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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c b/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c index fe200c82f22..f7306138732 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c +++ b/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c b/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c index aa951c97c74..d5c58561be2 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c +++ b/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c b/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c index 6b7dbd418a8..2bce8a2e5ff 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c +++ b/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c index 181b3d18443..d6f603e8b3c 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c +++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c index 97c91de8d61..16839612d0e 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c +++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c @@ -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\]* \\+ (4294967295|0x0*ffffffff)" "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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c index 802dbf02af4..d7b3914a85a 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c +++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c index d4d3085aa4e..239bf595d99 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c +++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c index 581f4d54a43..1a804a76716 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c +++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c index 664b62039fc..5f532638445 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c +++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c @@ -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 @@ -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" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c b/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c index 382f3231b71..e55084899f6 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c @@ -1,9 +1,9 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-profile-details" } */ +/* { dg-options "-O1 -fdump-tree-profile_estimate-details" } */ int f(void) { return 0; } -/* { dg-final { cleanup-tree-dump "profile" } } */ +/* { dg-final { cleanup-tree-dump "profile_estimate" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c index 479ed81d970..c2fb74e5871 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-profile" } */ +/* { dg-options "-O1 -fdump-tree-profile_estimate" } */ int foo(void); void bla(void); @@ -118,12 +118,12 @@ void test5 (void) } } -/* { dg-final { scan-tree-dump-times "Disambiguating loop" 5 "profile" } } */ +/* { dg-final { scan-tree-dump-times "Disambiguating loop" 5 "profile_estimate" } } */ /* For the following xfail marks, see PR35629. */ -/* { dg-final { scan-tree-dump-times "Found latch edge" 5 "profile" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "Merged latch edges" 2 "profile" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "4 loops found" 2 "profile" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "3 loops found" 2 "profile" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "2 loops found" 1 "profile" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "Found latch edge" 5 "profile_estimate" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "Merged latch edges" 2 "profile_estimate" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "4 loops found" 2 "profile_estimate" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "3 loops found" 2 "profile_estimate" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "2 loops found" 1 "profile_estimate" { xfail *-*-* } } } */ -/* { dg-final { cleanup-tree-dump "profile" } } */ +/* { dg-final { cleanup-tree-dump "profile_estimate" } } */ diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c index 69d77f07892..ab51e261a56 100644 --- a/gcc/tree-profile.c +++ b/gcc/tree-profile.c @@ -579,7 +579,7 @@ struct simple_ipa_opt_pass pass_ipa_tree_profile = { { SIMPLE_IPA_PASS, - "tree_profile_ipa", /* name */ + "profile", /* name */ gate_tree_profile_ipa, /* gate */ tree_profiling, /* execute */ NULL, /* sub */ -- 2.11.4.GIT