From: "Jørgen Kvalsvik" <jorgen.kvalsvik@woven-planet.global>
To: gcc-patches@gcc.gnu.org
Cc: "Jørgen Kvalsvik" <jorgen.kvalsvik@woven-planet.global>
Subject: [PATCH 1/2] gcov: test switch/break line counts
Date: Wed, 5 Oct 2022 14:04:02 +0200 [thread overview]
Message-ID: <20221005120403.68935-2-jorgen.kvalsvik@woven-planet.global> (raw)
In-Reply-To: <20221005120403.68935-1-jorgen.kvalsvik@woven-planet.global>
The coverage support will under some conditions decide to split edges to
accurately report coverage. By running the test suite with/without this
edge splitting a small diff shows up, addressed by this patch, which
should catch future regressions.
Removing the edge splitting:
diff --git a/gcc/profile.cc b/gcc/profile.cc
--- a/gcc/profile.cc
+++ b/gcc/profile.cc
@@ -1244,19 +1244,7 @@ branch_prob (bool thunk)
Don't do that when the locuses match, so
if (blah) goto something;
is not computed twice. */
- if (last
- && gimple_has_location (last)
- && !RESERVED_LOCATION_P (e->goto_locus)
- && !single_succ_p (bb)
- && (LOCATION_FILE (e->goto_locus)
- != LOCATION_FILE (gimple_location (last))
- || (LOCATION_LINE (e->goto_locus)
- != LOCATION_LINE (gimple_location (last)))))
- {
- basic_block new_bb = split_edge (e);
- edge ne = single_succ_edge (new_bb);
- ne->goto_locus = e->goto_locus;
- }
+
if ((e->flags & (EDGE_ABNORMAL | EDGE_ABNORMAL_CALL))
&& e->dest != EXIT_BLOCK_PTR_FOR_FN (cfun))
need_exit_edge = 1;
Assuming the .gcov files from make chec-gcc RUNTESTFLAGS=gcov.exp are
kept:
$ diff -r no-split-edge with-split-edge | grep -C 2 -E "^[<>]\s\s"
diff -r sans-split-edge/gcc/gcov-4.c.gcov with-split-edge/gcc/gcov-4.c.gcov
228c228
< -: 224: break;
---
> 1: 224: break;
231c231
< -: 227: break;
---
> #####: 227: break;
237c237
< -: 233: break;
---
> 2: 233: break;
gcc/testsuite/ChangeLog:
* g++.dg/gcov/gcov-1.C: Add line count check.
* gcc.misc-tests/gcov-4.c: Likewise.
---
gcc/testsuite/g++.dg/gcov/gcov-1.C | 8 ++++----
gcc/testsuite/gcc.misc-tests/gcov-4.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/g++.dg/gcov/gcov-1.C b/gcc/testsuite/g++.dg/gcov/gcov-1.C
index 9018b9a3a73..ee383b480a8 100644
--- a/gcc/testsuite/g++.dg/gcov/gcov-1.C
+++ b/gcc/testsuite/g++.dg/gcov/gcov-1.C
@@ -257,20 +257,20 @@ test_switch (int i, int j)
switch (i) /* count(5) */
/* branch(end) */
{
- case 1:
+ case 1: /* count(1) */
result = do_something (2); /* count(1) */
- break;
+ break; /* count(1) */
case 2:
result = do_something (1024);
break;
- case 3:
+ case 3: /* count(3) */
case 4:
/* branch(67) */
if (j == 2) /* count(3) */
/* branch(end) */
return do_something (4); /* count(1) */
result = do_something (8); /* count(2) */
- break;
+ break; /* count(2) */
default:
result = do_something (32); /* count(1) */
switch_m++; /* count(1) */
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-4.c b/gcc/testsuite/gcc.misc-tests/gcov-4.c
index 9d8ab1c1097..498d299b66b 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-4.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-4.c
@@ -221,7 +221,7 @@ test_switch (int i, int j)
{
case 1:
result = do_something (2); /* count(1) */
- break;
+ break; /* count(1) */
case 2:
result = do_something (1024);
break;
@@ -230,7 +230,7 @@ test_switch (int i, int j)
if (j == 2) /* count(3) */
return do_something (4); /* count(1) */
result = do_something (8); /* count(2) */
- break;
+ break; /* count(2) */
default:
result = do_something (32); /* count(1) */
switch_m++; /* count(1) */
--
2.30.2
next prev parent reply other threads:[~2022-10-05 12:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-05 12:04 [PATCH 0/2] gcov: Split when edge locus differ from dest bb Jørgen Kvalsvik
2022-10-05 12:04 ` Jørgen Kvalsvik [this message]
2022-10-05 12:27 ` [PATCH 1/2] gcov: test switch/break line counts Martin Liška
2022-10-05 12:04 ` [PATCH 2/2] Split edge when edge locus and dest don't match Jørgen Kvalsvik
2022-10-05 12:49 ` Martin Liška
2022-10-06 8:12 ` Richard Biener
2022-10-06 14:28 ` Jørgen Kvalsvik
2022-10-07 6:53 ` Richard Biener
2022-10-07 11:45 ` Jørgen Kvalsvik
2022-10-11 10:57 ` Jørgen Kvalsvik
2022-10-11 11:27 ` Richard Biener
2022-10-11 12:43 [PATCH 1/2] gcov: test switch/break line counts Jørgen Kvalsvik
2022-10-11 13:55 ` Michael Matz
2022-10-11 13:57 ` Jørgen Kvalsvik
2022-10-11 14:00 ` Michael Matz
2022-10-13 11:39 ` Richard Biener
2022-10-14 10:09 ` Jørgen Kvalsvik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221005120403.68935-2-jorgen.kvalsvik@woven-planet.global \
--to=jorgen.kvalsvik@woven-planet.global \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).