From 88307040642311b32de4fb051a64ae2796e0f1dc Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 27 Sep 2018 16:53:35 +0200 Subject: [PATCH] coverage.c (get_coverage_counts): Revert the formatting of missing profile opt info. 2018-09-27 Martin Liska * coverage.c (get_coverage_counts): Revert the formatting of missing profile opt info. * g++.dg/pr60518.C: Add -Wno-missing-profile. * g++.dg/torture/pr59265.C: Likewise. * g++.dg/tree-prof/morefunc.C: Likewise. * g++.dg/tree-ssa/dom-invalid.C: Likewise. * gcc.dg/pr26570.c: Likewise. * gcc.dg/pr32773.c: Likewise. * gcc.dg/pr40209.c: Likewise. * gcc.dg/pr51957-1.c: Likewise. * gcc.dg/pr80747.c: Likewise. * gcc.target/aarch64/pr62262.c: Likewise. From-SVN: r264669 --- gcc/ChangeLog | 5 +++++ gcc/coverage.c | 10 ++++------ gcc/testsuite/ChangeLog | 13 +++++++++++++ gcc/testsuite/g++.dg/pr60518.C | 2 +- gcc/testsuite/g++.dg/torture/pr59265.C | 2 +- gcc/testsuite/g++.dg/tree-prof/morefunc.C | 2 +- gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C | 2 +- gcc/testsuite/gcc.dg/pr26570.c | 2 +- gcc/testsuite/gcc.dg/pr32773.c | 4 ++-- gcc/testsuite/gcc.dg/pr40209.c | 2 +- gcc/testsuite/gcc.dg/pr51957-1.c | 2 +- gcc/testsuite/gcc.dg/pr80747.c | 2 +- gcc/testsuite/gcc.target/aarch64/pr62262.c | 2 +- 13 files changed, 33 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4255d268398..4cd9f8c3f99 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-09-27 Martin Liska + + * coverage.c (get_coverage_counts): Revert the formatting + of missing profile opt info. + 2018-09-27 Richard Biener PR debug/37801 diff --git a/gcc/coverage.c b/gcc/coverage.c index 19c696c3493..6b45ce9085b 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -314,12 +314,10 @@ get_coverage_counts (unsigned counter, unsigned cfg_checksum, dump_user_location_t loc = dump_user_location_t::from_location_t (input_location); dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, loc, - "file %s not found\n", - da_file_name); - dump_printf (MSG_OPTIMIZED_LOCATIONS, - (flag_guess_branch_prob - ? "execution counts estimated\n" - : "execution counts assumed to be zero\n")); + "file %s not found, %s\n", da_file_name, + (flag_guess_branch_prob + ? "execution counts estimated" + : "execution counts assumed to be zero")); } } return NULL; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 19f4eaf90c9..834b9b0c6bf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2018-09-27 Martin Liska + + * g++.dg/pr60518.C: Add -Wno-missing-profile. + * g++.dg/torture/pr59265.C: Likewise. + * g++.dg/tree-prof/morefunc.C: Likewise. + * g++.dg/tree-ssa/dom-invalid.C: Likewise. + * gcc.dg/pr26570.c: Likewise. + * gcc.dg/pr32773.c: Likewise. + * gcc.dg/pr40209.c: Likewise. + * gcc.dg/pr51957-1.c: Likewise. + * gcc.dg/pr80747.c: Likewise. + * gcc.target/aarch64/pr62262.c: Likewise. + 2018-09-27 Richard Biener PR testsuite/87451 diff --git a/gcc/testsuite/g++.dg/pr60518.C b/gcc/testsuite/g++.dg/pr60518.C index e3da48a2ec9..e4a80da29ee 100644 --- a/gcc/testsuite/g++.dg/pr60518.C +++ b/gcc/testsuite/g++.dg/pr60518.C @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-Os -fprofile-use" } +// { dg-options "-Os -fprofile-use -Wno-missing-profile" } int a; int fn1 () { return a == ',' || a == ';'; } diff --git a/gcc/testsuite/g++.dg/torture/pr59265.C b/gcc/testsuite/g++.dg/torture/pr59265.C index d48efe59395..f3dceb929d2 100644 --- a/gcc/testsuite/g++.dg/torture/pr59265.C +++ b/gcc/testsuite/g++.dg/torture/pr59265.C @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-fprofile-use -std=gnu++11 -Wno-return-type" } +// { dg-options "-fprofile-use -std=gnu++11 -Wno-return-type -Wno-missing-profile" } class A { int m_fn1() const; diff --git a/gcc/testsuite/g++.dg/tree-prof/morefunc.C b/gcc/testsuite/g++.dg/tree-prof/morefunc.C index 2e3fc114758..a9bdc167f45 100644 --- a/gcc/testsuite/g++.dg/tree-prof/morefunc.C +++ b/gcc/testsuite/g++.dg/tree-prof/morefunc.C @@ -1,4 +1,4 @@ -/* { dg-options "-O2 -fno-devirtualize --param=profile-func-internal-id=0 -fdump-ipa-profile -fdump-ipa-afdo -Wno-attributes -Wno-coverage-mismatch" } */ +/* { dg-options "-O2 -fno-devirtualize --param=profile-func-internal-id=0 -fdump-ipa-profile -fdump-ipa-afdo -Wno-attributes -Wno-coverage-mismatch -Wno-missing-profile" } */ #include "reorder_class1.h" #include "reorder_class2.h" diff --git a/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C b/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C index 41343ee4206..3c01383f809 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C +++ b/gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C @@ -1,7 +1,7 @@ // PR tree-optimization/39557 // invalid post-dom info leads to infinite loop // { dg-do run } -// { dg-options "-Wall -fno-exceptions -O2 -fprofile-use -fopt-info -fno-rtti" } +// { dg-options "-Wall -fno-exceptions -O2 -fprofile-use -fopt-info -fno-rtti -Wno-missing-profile" } struct C { diff --git a/gcc/testsuite/gcc.dg/pr26570.c b/gcc/testsuite/gcc.dg/pr26570.c index 8ce8a4465e8..007076f9659 100644 --- a/gcc/testsuite/gcc.dg/pr26570.c +++ b/gcc/testsuite/gcc.dg/pr26570.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fprofile-generate -fprofile-use -fopt-info" } */ +/* { dg-options "-O2 -fprofile-generate -fprofile-use -fopt-info -Wno-missing-profile" } */ /* { dg-require-profiling "-fprofile-generate" } */ unsigned test (unsigned a, unsigned b) diff --git a/gcc/testsuite/gcc.dg/pr32773.c b/gcc/testsuite/gcc.dg/pr32773.c index 19a90195ad3..fe046d9fe47 100644 --- a/gcc/testsuite/gcc.dg/pr32773.c +++ b/gcc/testsuite/gcc.dg/pr32773.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-O -fprofile-use -fopt-info" } */ -/* { dg-options "-O -m4 -fprofile-use -fopt-info" { target sh-*-* } } */ +/* { dg-options "-O -fprofile-use -fopt-info -Wno-missing-profile" } */ +/* { dg-options "-O -m4 -fprofile-use -fopt-info -Wno-missing-profile" { target sh-*-* } } */ void foo (int *p) { diff --git a/gcc/testsuite/gcc.dg/pr40209.c b/gcc/testsuite/gcc.dg/pr40209.c index afe131fc5eb..4e77df5c2e6 100644 --- a/gcc/testsuite/gcc.dg/pr40209.c +++ b/gcc/testsuite/gcc.dg/pr40209.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fprofile-use -fopt-info" } */ +/* { dg-options "-O2 -fprofile-use -fopt-info -Wno-missing-profile" } */ void process(const char *s); diff --git a/gcc/testsuite/gcc.dg/pr51957-1.c b/gcc/testsuite/gcc.dg/pr51957-1.c index d899771ad00..d6712b5be2a 100644 --- a/gcc/testsuite/gcc.dg/pr51957-1.c +++ b/gcc/testsuite/gcc.dg/pr51957-1.c @@ -1,6 +1,6 @@ /* PR target/51957 */ /* { dg-do link } */ -/* { dg-options "-O2 -g -fprofile-use" } */ +/* { dg-options "-O2 -g -fprofile-use -Wno-missing-profile" } */ /* { dg-additional-sources "pr51957-2.c" } */ int v[128]; diff --git a/gcc/testsuite/gcc.dg/pr80747.c b/gcc/testsuite/gcc.dg/pr80747.c index ea9dd3c3033..8befab2ab1c 100644 --- a/gcc/testsuite/gcc.dg/pr80747.c +++ b/gcc/testsuite/gcc.dg/pr80747.c @@ -1,6 +1,6 @@ /* PR rtl-optimization/80747 */ /* { dg-do compile } */ -/* { dg-options "-fprofile-use -freorder-blocks-and-partition -O1 -foptimize-sibling-calls" } */ +/* { dg-options "-fprofile-use -freorder-blocks-and-partition -O1 -foptimize-sibling-calls -Wno-missing-profile" } */ int foo (int a) diff --git a/gcc/testsuite/gcc.target/aarch64/pr62262.c b/gcc/testsuite/gcc.target/aarch64/pr62262.c index 5bf90bf7fe3..6edb3c73c6b 100644 --- a/gcc/testsuite/gcc.target/aarch64/pr62262.c +++ b/gcc/testsuite/gcc.target/aarch64/pr62262.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fprofile-use" } */ +/* { dg-options "-O2 -fprofile-use -Wno-missing-profile" } */ static inline int CLZ(int mask) { return mask ? __builtin_clz(mask) : 32; -- 2.30.2