[PATCH 3/3] Dump -fdbg-cnt limit reach also to stderr stream.

[PATCH 3/3] Dump -fdbg-cnt limit reach also to stderr stream.

[marxin]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]


gcc/ChangeLog:

2019-03-27  Martin Liska  <mliska@suse.cz>

	* dbgcnt.c (print_limit_reach): New function.
	(dbg_cnt): Use it.
---
 gcc/dbgcnt.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-Dump-fdbg-cnt-limit-reach-also-to-stderr-stream.patch --]
[-- Type: text/x-patch; name="0003-Dump-fdbg-cnt-limit-reach-also-to-stderr-stream.patch", Size: 1399 bytes --]

diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c
index 5a7c9a8bf6e..cfa03d611ee 100644
--- a/gcc/dbgcnt.c
+++ b/gcc/dbgcnt.c
@@ -59,21 +59,27 @@ dbg_cnt_is_enabled (enum debug_counter index)
   return v > limit_low[index] && v <= limit_high[index];
 }
 
+static void
+print_limit_reach (const char *counter, int limit, bool upper_p)
+{
+  char buffer[128];
+  sprintf (buffer, "***dbgcnt: %s limit %d reached for %s.***\n",
+	   upper_p ? "upper" : "lower", limit, counter);
+  fputs (buffer, stderr);
+  if (dump_file)
+    fputs (buffer, dump_file);
+}
+
 bool
 dbg_cnt (enum debug_counter index)
 {
   count[index]++;
 
-  if (dump_file)
-    {
-      /* Do not print the info for default lower limit.  */
-      if (count[index] == limit_low[index] && limit_low[index] > 0)
-	fprintf (dump_file, "***dbgcnt: lower limit %d reached for %s.***\n",
-		 limit_low[index], map[index].name);
-      else if (count[index] == limit_high[index])
-	fprintf (dump_file, "***dbgcnt: upper limit %d reached for %s.***\n",
-		 limit_high[index], map[index].name);
-    }
+  /* Do not print the info for default lower limit.  */
+  if (count[index] == limit_low[index] && limit_low[index] > 0)
+    print_limit_reach (map[index].name, limit_low[index], false);
+  else if (count[index] == limit_high[index])
+    print_limit_reach (map[index].name, limit_high[index], true);
 
   return dbg_cnt_is_enabled (index);
 }

[PATCH 0/3] Fix and improve -fdbg-cnt option.

[marxin]

Hi.

While I was working on PR84201 it was very handy for me to use debug counters
for a particular source file. That's because I can't run a verification
on a spec result and I was unable to persuade runspec command to use a modified binary
for run.

Thus's I'm suggesting extension of the option to filter aux_base_name.

I've been testing the series right now.
Thoughts?
Thanks,
Martin

marxin (3):
  Fix multiple values for -fdbg-cnt.
  Extend format of -fdbg-cnt: add aux_base filter.
  Dump -fdbg-cnt limit reach also to stderr stream.

 gcc/dbgcnt.c                     | 60 ++++++++++++++++++++------------
 gcc/doc/invoke.texi              |  8 +++--
 gcc/testsuite/gcc.dg/dbg-cnt-1.c |  6 ++++
 3 files changed, 50 insertions(+), 24 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/dbg-cnt-1.c

-- 
2.21.0

[PATCH 2/3] Extend format of -fdbg-cnt: add aux_base filter.

[marxin]

[-- Attachment #1: Type: text/plain, Size: 620 bytes --]


gcc/ChangeLog:

2019-03-27  Martin Liska  <mliska@suse.cz>

	* dbgcnt.c (dbg_cnt_set_limit_by_name): Add new argument
	aux_base and filter based on aux_base_name.
	(dbg_cnt_process_single_pair): Parse aux_base.
	* doc/invoke.texi: Document new extended format.

gcc/testsuite/ChangeLog:

2019-03-27  Martin Liska  <mliska@suse.cz>

	* gcc.dg/dbg-cnt-1.c: New test.
---
 gcc/dbgcnt.c                     | 11 ++++++++---
 gcc/doc/invoke.texi              |  8 ++++++--
 gcc/testsuite/gcc.dg/dbg-cnt-1.c |  6 ++++++
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/dbg-cnt-1.c


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-Extend-format-of-fdbg-cnt-add-aux_base-filter.patch --]
[-- Type: text/x-patch; name="0002-Extend-format-of-fdbg-cnt-add-aux_base-filter.patch", Size: 3175 bytes --]

diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c
index e2f65f449e5..5a7c9a8bf6e 100644
--- a/gcc/dbgcnt.c
+++ b/gcc/dbgcnt.c
@@ -24,6 +24,7 @@ See dbgcnt.def for usage information.  */
 #include "coretypes.h"
 #include "diagnostic-core.h"
 #include "dumpfile.h"
+#include "options.h"
 
 #include "dbgcnt.h"
 
@@ -87,8 +88,11 @@ dbg_cnt_set_limit_by_index (enum debug_counter index, int low, int high)
 }
 
 static bool
-dbg_cnt_set_limit_by_name (const char *name, int low, int high)
+dbg_cnt_set_limit_by_name (const char *name, int low, int high, char *aux_base)
 {
+  if (aux_base != NULL && strcmp (aux_base_name, aux_base) != 0)
+    return true;
+
   if (high < low)
     {
       error ("%<-fdbg-cnt=%s:%d:%d%> has smaller upper limit than the lower",
@@ -123,7 +127,7 @@ dbg_cnt_set_limit_by_name (const char *name, int low, int high)
 }
 
 
-/* Process a single "name:value" pair.
+/* Process a single "name:value1[:value2][:aux_base]" tuple.
    Returns NULL if there's no valid pair is found.
    Otherwise returns a pointer to the end of the pair. */
 
@@ -134,6 +138,7 @@ dbg_cnt_process_single_pair (const char *arg)
   char *name = strtok (str, ":");
   char *value1 = strtok (NULL, ":");
   char *value2 = strtok (NULL, ":");
+  char *aux_base = strtok (NULL, ":");
 
   int high, low;
 
@@ -151,7 +156,7 @@ dbg_cnt_process_single_pair (const char *arg)
       high = strtol (value2, NULL, 10);
     }
 
-  return dbg_cnt_set_limit_by_name (name, low, high);
+  return dbg_cnt_set_limit_by_name (name, low, high, aux_base);
 }
 
 void
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 4735b0ab673..d2934edd36d 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -15386,10 +15386,14 @@ Print the name and the counter upper bound for all debug counters.
 @item -fdbg-cnt=@var{counter-value-list}
 @opindex fdbg-cnt
 Set the internal debug counter lower and upper bound.  @var{counter-value-list}
-is a comma-separated list of @var{name}:@var{lower_bound}:@var{upper_bound}
+is a comma-separated list of
+@var{name}:@var{lower_bound}:@var{upper_bound}:@var{aux_base_name}
 tuples which sets the lower and the upper bound of each debug
 counter @var{name}.  The @var{lower_bound} is optional and is zero
-initialized if not set.
+initialized if not set.  When @var{aux_base_name} is set, the debug counter
+is only applied to source files that match by @option{-auxbase}.
+The @var{aux_base_name} is also optional.
+
 All debug counters have the initial upper bound of @code{UINT_MAX};
 thus @code{dbg_cnt} returns true always unless the upper bound
 is set by this option.
diff --git a/gcc/testsuite/gcc.dg/dbg-cnt-1.c b/gcc/testsuite/gcc.dg/dbg-cnt-1.c
new file mode 100644
index 00000000000..2afd2428eb9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dbg-cnt-1.c
@@ -0,0 +1,6 @@
+/* { dg-do compile } */
+/* { dg-options "-fdbg-cnt=vect_loop:1:2,vect_slp:2,merged_ipa_icf:7:8:dbg-cnt-1" } */
+/* { dg-additional-options "-mavx2" { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-prune-output "dbg_cnt 'vect_loop' set to 1-2" } */
+/* { dg-prune-output "dbg_cnt 'vect_slp' set to 0-2" } */
+/* { dg-prune-output "dbg_cnt 'merged_ipa_icf' set to 7-8" } */

[PATCH 1/3] Fix multiple values for -fdbg-cnt.

[marxin]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]


gcc/ChangeLog:

2019-03-27  Martin Liska  <mliska@suse.cz>

	* dbgcnt.c (dbg_cnt_process_single_pair): Fix GNU coding style.
	(dbg_cnt_process_opt): Parse first tokens aas
	dbg_cnt_process_single_pair is also using strtok.
---
 gcc/dbgcnt.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-multiple-values-for-fdbg-cnt.patch --]
[-- Type: text/x-patch; name="0001-Fix-multiple-values-for-fdbg-cnt.patch", Size: 1387 bytes --]

diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c
index ebaa310821c..e2f65f449e5 100644
--- a/gcc/dbgcnt.c
+++ b/gcc/dbgcnt.c
@@ -151,30 +151,35 @@ dbg_cnt_process_single_pair (const char *arg)
       high = strtol (value2, NULL, 10);
     }
 
-   return dbg_cnt_set_limit_by_name (name, low, high);
+  return dbg_cnt_set_limit_by_name (name, low, high);
 }
 
 void
 dbg_cnt_process_opt (const char *arg)
 {
   char *str = xstrdup (arg);
-  const char *next = strtok (str, ",");
   unsigned int start = 0;
 
-   do {
-     if (!dbg_cnt_process_single_pair (arg))
+  auto_vec<const char *> tokens;
+  for (const char *next = strtok (str, ","); next != NULL;
+       next = strtok (NULL, ","))
+    tokens.safe_push (next);
+
+  unsigned i;
+  for (i = 0; i < tokens.length (); i++)
+    {
+     if (!dbg_cnt_process_single_pair (tokens[i]))
        break;
-     start += strlen (arg) + 1;
-     next = strtok (NULL, ",");
-   } while (next != NULL);
+     start += strlen (tokens[i]) + 1;
+    }
 
-   if (next != NULL)
+   if (i != tokens.length ())
      {
        char *buffer = XALLOCAVEC (char, start + 2);
        sprintf (buffer, "%*c", start + 1, '^');
        error ("cannot find a valid counter:value pair:");
-       error ("%<-fdbg-cnt=%s%>", next);
-       error ("          %s", buffer);
+       error ("%<-fdbg-cnt=%s%>", arg);
+       error ("           %s", buffer);
      }
 }
 

Re: [PATCH 3/3] Dump -fdbg-cnt limit reach also to stderr stream.

[Richard Biener]

On Wed, Mar 27, 2019 at 10:52 AM marxin <mliska@suse.cz> wrote:
>

Hmm, I guess I can see how this is useful, thus OK.

Richard.

> gcc/ChangeLog:
>
> 2019-03-27  Martin Liska  <mliska@suse.cz>
>
>         * dbgcnt.c (print_limit_reach): New function.
>         (dbg_cnt): Use it.
> ---
>  gcc/dbgcnt.c | 26 ++++++++++++++++----------
>  1 file changed, 16 insertions(+), 10 deletions(-)
>

Re: [PATCH 1/3] Fix multiple values for -fdbg-cnt.

[Richard Biener]

On Wed, Mar 27, 2019 at 10:52 AM marxin <mliska@suse.cz> wrote:
>
>
> gcc/ChangeLog:
>
> 2019-03-27  Martin Liska  <mliska@suse.cz>
>
>         * dbgcnt.c (dbg_cnt_process_single_pair): Fix GNU coding style.
>         (dbg_cnt_process_opt): Parse first tokens aas

as

so what was the issue you fixed?

>         dbg_cnt_process_single_pair is also using strtok.
> ---
>  gcc/dbgcnt.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
>

Re: [PATCH 2/3] Extend format of -fdbg-cnt: add aux_base filter.

[Richard Biener]

On Wed, Mar 27, 2019 at 10:52 AM marxin <mliska@suse.cz> wrote:
>

Hmm, I don't think we want this - it looks too much like a hack to me.

I guess for an easier way to figure out the min/max ranges (do we
handle anti-ranges?) would be to specify a function name the
debug counter would be enabled for.  That might also help in your
situation.

What I've usually done is do the bisection via dbg-counter on
a single file, manually link the spec binary and then
do a runcpu w/o recompiling the binary.

Richard.

> gcc/ChangeLog:
>
> 2019-03-27  Martin Liska  <mliska@suse.cz>
>
>         * dbgcnt.c (dbg_cnt_set_limit_by_name): Add new argument
>         aux_base and filter based on aux_base_name.
>         (dbg_cnt_process_single_pair): Parse aux_base.
>         * doc/invoke.texi: Document new extended format.
>
> gcc/testsuite/ChangeLog:
>
> 2019-03-27  Martin Liska  <mliska@suse.cz>
>
>         * gcc.dg/dbg-cnt-1.c: New test.
> ---
>  gcc/dbgcnt.c                     | 11 ++++++++---
>  gcc/doc/invoke.texi              |  8 ++++++--
>  gcc/testsuite/gcc.dg/dbg-cnt-1.c |  6 ++++++
>  3 files changed, 20 insertions(+), 5 deletions(-)
>  create mode 100644 gcc/testsuite/gcc.dg/dbg-cnt-1.c
>

Re: [PATCH 1/3] Fix multiple values for -fdbg-cnt.

[Martin Liška]

On 3/28/19 1:51 PM, Richard Biener wrote:
> On Wed, Mar 27, 2019 at 10:52 AM marxin <mliska@suse.cz> wrote:
>>
>>
>> gcc/ChangeLog:
>>
>> 2019-03-27  Martin Liska  <mliska@suse.cz>
>>
>>         * dbgcnt.c (dbg_cnt_process_single_pair): Fix GNU coding style.
>>         (dbg_cnt_process_opt): Parse first tokens aas
> 
> as

Better than 'ass' :)

> 
> so what was the issue you fixed?

$ gcc -c -fdbg-cnt=dce:0,vect_slp:3 main.c
dbg_cnt 'dce' set to 0-3

while correct output is:

$ gcc-8 -c -fdbg-cnt=dce:0,vect_slp:3 main.c
dbg_cnt 'dce' set to 0
dbg_cnt 'vect_slp' set to 3

Martin

> 
>>         dbg_cnt_process_single_pair is also using strtok.
>> ---
>>  gcc/dbgcnt.c | 25 +++++++++++++++----------
>>  1 file changed, 15 insertions(+), 10 deletions(-)
>>

Re: [PATCH 1/3] Fix multiple values for -fdbg-cnt.

[Richard Biener]

On Thu, Mar 28, 2019 at 2:05 PM Martin Liška <mliska@suse.cz> wrote:
>
> On 3/28/19 1:51 PM, Richard Biener wrote:
> > On Wed, Mar 27, 2019 at 10:52 AM marxin <mliska@suse.cz> wrote:
> >>
> >>
> >> gcc/ChangeLog:
> >>
> >> 2019-03-27  Martin Liska  <mliska@suse.cz>
> >>
> >>         * dbgcnt.c (dbg_cnt_process_single_pair): Fix GNU coding style.
> >>         (dbg_cnt_process_opt): Parse first tokens aas
> >
> > as
>
> Better than 'ass' :)
>
> >
> > so what was the issue you fixed?
>
> $ gcc -c -fdbg-cnt=dce:0,vect_slp:3 main.c
> dbg_cnt 'dce' set to 0-3
>
> while correct output is:
>
> $ gcc-8 -c -fdbg-cnt=dce:0,vect_slp:3 main.c
> dbg_cnt 'dce' set to 0
> dbg_cnt 'vect_slp' set to 3

Ah.

OK.
Richard.

> Martin
>
> >
> >>         dbg_cnt_process_single_pair is also using strtok.
> >> ---
> >>  gcc/dbgcnt.c | 25 +++++++++++++++----------
> >>  1 file changed, 15 insertions(+), 10 deletions(-)
> >>
>

Re: [PATCH 2/3] Extend format of -fdbg-cnt: add aux_base filter.

[Martin Liška]

On 3/28/19 1:53 PM, Richard Biener wrote:
> On Wed, Mar 27, 2019 at 10:52 AM marxin <mliska@suse.cz> wrote:
>>
> 
> Hmm, I don't think we want this - it looks too much like a hack to me.
> 
> I guess for an easier way to figure out the min/max ranges (do we
> handle anti-ranges?) would be to specify a function name the
> debug counter would be enabled for.  That might also help in your
> situation.

Well, it's a bit hack, but a useful one. In my case I had a couple
files which triggered the debug counter limit. Function filter will
work, but note that you have also an IPA debug counters. Here function
context can be not clear.

> 
> What I've usually done is do the bisection via dbg-counter on
> a single file, manually link the spec binary and then
> do a runcpu w/o recompiling the binary.

Having a complex build system, adjusting just -dbg-cnt is much more convenient
than doing a manual setup.

Martin

> 
> Richard.
> 
>> gcc/ChangeLog:
>>
>> 2019-03-27  Martin Liska  <mliska@suse.cz>
>>
>>         * dbgcnt.c (dbg_cnt_set_limit_by_name): Add new argument
>>         aux_base and filter based on aux_base_name.
>>         (dbg_cnt_process_single_pair): Parse aux_base.
>>         * doc/invoke.texi: Document new extended format.
>>
>> gcc/testsuite/ChangeLog:
>>
>> 2019-03-27  Martin Liska  <mliska@suse.cz>
>>
>>         * gcc.dg/dbg-cnt-1.c: New test.
>> ---
>>  gcc/dbgcnt.c                     | 11 ++++++++---
>>  gcc/doc/invoke.texi              |  8 ++++++--
>>  gcc/testsuite/gcc.dg/dbg-cnt-1.c |  6 ++++++
>>  3 files changed, 20 insertions(+), 5 deletions(-)
>>  create mode 100644 gcc/testsuite/gcc.dg/dbg-cnt-1.c
>>

Re: [PATCH 1/3] Fix multiple values for -fdbg-cnt.

[Jeff Law]

On 3/27/19 1:43 AM, marxin wrote:
> 
> gcc/ChangeLog:
> 
> 2019-03-27  Martin Liska  <mliska@suse.cz>
> 
> 	* dbgcnt.c (dbg_cnt_process_single_pair): Fix GNU coding style.
> 	(dbg_cnt_process_opt): Parse first tokens aas
> 	dbg_cnt_process_single_pair is also using strtok.
> ---
>  gcc/dbgcnt.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
> 
OK, though please fix the ChangeLog typo :-)

jeff

Re: [PATCH 2/3] Extend format of -fdbg-cnt: add aux_base filter.

[Jeff Law]

On 3/27/19 2:38 AM, marxin wrote:
> gcc/ChangeLog:
> 
> 2019-03-27  Martin Liska  <mliska@suse.cz>
> 
> 	* dbgcnt.c (dbg_cnt_set_limit_by_name): Add new argument
> 	aux_base and filter based on aux_base_name.
> 	(dbg_cnt_process_single_pair): Parse aux_base.
> 	* doc/invoke.texi: Document new extended format.
> 
> gcc/testsuite/ChangeLog:
> 
> 2019-03-27  Martin Liska  <mliska@suse.cz>
> 
> 	* gcc.dg/dbg-cnt-1.c: New test.
OK.
jeff

Re: [PATCH 3/3] Dump -fdbg-cnt limit reach also to stderr stream.

[Jeff Law]

On 3/27/19 2:39 AM, marxin wrote:
> 
> gcc/ChangeLog:
> 
> 2019-03-27  Martin Liska  <mliska@suse.cz>
> 
> 	* dbgcnt.c (print_limit_reach): New function.
> 	(dbg_cnt): Use it.
> ---
>  gcc/dbgcnt.c | 26 ++++++++++++++++----------
>  1 file changed, 16 insertions(+), 10 deletions(-)
> 
Given this is dbgcnt stuff I don't think we have to deal with
translation issues.  OK for the trunk.

jeff