[PATCH] Skip preprocessor directives in mklog

[PATCH] Skip preprocessor directives in mklog

[Yury Gribov]

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

Hi all,

Contrib/mklog is currently faked by preprocessor directives inside 
functions to produce invalid ChangeLog.  The attached patch fixes this.

Tested with my local mklog testsuite and http://paste.debian.net/167999/ 
.  Ok to commit?

-Y

[-- Attachment #2: mklog-1.diff --]
[-- Type: text/x-patch, Size: 817 bytes --]

commit 23a738d05393676e72db82cb527d5fb1b3060e2f
Author: Yury Gribov <y.gribov@samsung.com>
Date:   Tue Apr 21 14:17:23 2015 +0300

    2015-04-21  Yury Gribov  <y.gribov@samsung.com>
    
    	* mklog: Ignore preprocessor directives.

diff --git a/contrib/mklog b/contrib/mklog
index f7974a7..455614b 100755
--- a/contrib/mklog
+++ b/contrib/mklog
@@ -131,7 +131,6 @@ sub is_unified_hunk_start {
 }
 
 # Check if line is a top-level declaration.
-# TODO: ignore preprocessor directives except maybe #define ?
 sub is_top_level {
 	my ($function, $is_context_diff) = (@_);
 	if (is_unified_hunk_start ($function)
@@ -143,7 +142,7 @@ sub is_top_level {
 	} else {
 		$function =~ s/^.//;
 	}
-	return $function && $function !~ /^[\s{]/;
+	return $function && $function !~ /^[\s{#]/;
 }
 
 # Read contents of .diff file

Re: [PATCH] Skip preprocessor directives in mklog

[Tom de Vries]

On 21-04-15 13:26, Yury Gribov wrote:
> Hi all,
>
> Contrib/mklog is currently faked by preprocessor directives inside functions to
> produce invalid ChangeLog.

Hi Yury,

The effect of the patch on the mklog output using the pastebin input is:
...
@@ -2,11 +2,13 @@

  2015-04-21  x  <y@z>

-       * builtins.c:
+       * builtins.c (expand_builtin):
         * defaults.h:
-       * df-scan.c:
+       * df-scan.c (df_bb_refs_collect):
+       (df_get_exit_block_use_set):
         * except.c:
-       * haifa-sched.c:
-       * ira-lives.c:
-       * lra-lives.c:
+       * haifa-sched.c (initiate_bb_reg_pressure_info):
+       * ira-lives.c (process_bb_node_lives):
+       * lra-lives.c (process_bb_lives):
...


So, for f.i. this patch hunk:
...
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 9263777..028d793 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -6510,10 +6510,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, 
machine_mode mode,
        expand_builtin_eh_return (CALL_EXPR_ARG (exp, 0),
  				CALL_EXPR_ARG (exp, 1));
        return const0_rtx;
-#ifdef EH_RETURN_DATA_REGNO
      case BUILT_IN_EH_RETURN_DATA_REGNO:
        return expand_builtin_eh_return_data_regno (exp);
-#endif
      case BUILT_IN_EXTEND_POINTER:
        return expand_builtin_extend_pointer (CALL_EXPR_ARG (exp, 0));
      case BUILT_IN_EH_POINTER:
...

with the patch we output:
...
        * builtins.c (expand_builtin):
...

instead of:
...
        * builtins.c:
...

That looks like an improvement to me.

Thanks,
- Tom

>  The attached patch fixes this.
>
> Tested with my local mklog testsuite and http://paste.debian.net/167999/ .  Ok
> to commit?
>
> -Y
>
> mklog-1.diff
>
>
> commit 23a738d05393676e72db82cb527d5fb1b3060e2f
> Author: Yury Gribov<y.gribov@samsung.com>
> Date:   Tue Apr 21 14:17:23 2015 +0300
>
>      2015-04-21  Yury Gribov<y.gribov@samsung.com>
>
>      	* mklog: Ignore preprocessor directives.
>
> diff --git a/contrib/mklog b/contrib/mklog
> index f7974a7..455614b 100755
> --- a/contrib/mklog
> +++ b/contrib/mklog
> @@ -131,7 +131,6 @@ sub is_unified_hunk_start {
>   }
>
>   # Check if line is a top-level declaration.
> -# TODO: ignore preprocessor directives except maybe #define ?
>   sub is_top_level {
>   	my ($function, $is_context_diff) = (@_);
>   	if (is_unified_hunk_start ($function)
> @@ -143,7 +142,7 @@ sub is_top_level {
>   	} else {
>   		$function =~ s/^.//;
>   	}
> -	return $function && $function !~ /^[\s{]/;
> +	return $function && $function !~ /^[\s{#]/;
>   }
>
>   # Read contents of .diff file
>

[PATCH][PING] Skip preprocessor directives in mklog

[Yury Gribov]

On 04/21/2015 02:26 PM, Yury Gribov wrote:
> Hi all,
>
> Contrib/mklog is currently faked by preprocessor directives inside
> functions to produce invalid ChangeLog.  The attached patch fixes this.
>
> Tested with my local mklog testsuite and http://paste.debian.net/167999/
> .  Ok to commit?

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Diego Novillo]

The patch looks fine to me.

I'm not really involved in GCC development anymore. I would suggest
that this script should be maintained by whoever's been hacking on it
the most. It's a simple script, so it shouldn't be hard to find a new
maintainer for it.


Diegop.

On Tue, May 12, 2015 at 11:19 AM, Yury Gribov <y.gribov@samsung.com> wrote:
> On 04/30/2015 12:03 PM, Yury Gribov wrote:
>>
>> On 04/21/2015 02:26 PM, Yury Gribov wrote:
>>>
>>> Hi all,
>>>
>>> Contrib/mklog is currently faked by preprocessor directives inside
>>> functions to produce invalid ChangeLog.  The attached patch fixes this.
>>>
>>> Tested with my local mklog testsuite and http://paste.debian.net/167999/
>>> .  Ok to commit?
>
>
> Ping.
>
>
> commit 23a738d05393676e72db82cb527d5fb1b3060e2f
> Author: Yury Gribov <y.gribov@samsung.com>
> Date:   Tue Apr 21 14:17:23 2015 +0300
>
>     2015-04-21  Yury Gribov  <y.gribov@samsung.com>
>
>         * mklog: Ignore preprocessor directives.
>
> diff --git a/contrib/mklog b/contrib/mklog
> index f7974a7..455614b 100755
> --- a/contrib/mklog
> +++ b/contrib/mklog
> @@ -131,7 +131,6 @@ sub is_unified_hunk_start {
>  }
>
>  # Check if line is a top-level declaration.
> -# TODO: ignore preprocessor directives except maybe #define ?
>  sub is_top_level {
>         my ($function, $is_context_diff) = (@_);
>         if (is_unified_hunk_start ($function)
> @@ -143,7 +142,7 @@ sub is_top_level {
>         } else {
>                 $function =~ s/^.//;
>         }
> -       return $function && $function !~ /^[\s{]/;
> +       return $function && $function !~ /^[\s{#]/;
>  }
>
>  # Read contents of .diff file
>

[PATCH][PING^2] Skip preprocessor directives in mklog

[Yury Gribov]

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

On 04/30/2015 12:03 PM, Yury Gribov wrote:
> On 04/21/2015 02:26 PM, Yury Gribov wrote:
>> Hi all,
>>
>> Contrib/mklog is currently faked by preprocessor directives inside
>> functions to produce invalid ChangeLog.  The attached patch fixes this.
>>
>> Tested with my local mklog testsuite and http://paste.debian.net/167999/
>> .  Ok to commit?

Ping.


[-- Attachment #2: mklog-1.diff --]
[-- Type: text/x-patch, Size: 817 bytes --]

commit 23a738d05393676e72db82cb527d5fb1b3060e2f
Author: Yury Gribov <y.gribov@samsung.com>
Date:   Tue Apr 21 14:17:23 2015 +0300

    2015-04-21  Yury Gribov  <y.gribov@samsung.com>
    
    	* mklog: Ignore preprocessor directives.

diff --git a/contrib/mklog b/contrib/mklog
index f7974a7..455614b 100755
--- a/contrib/mklog
+++ b/contrib/mklog
@@ -131,7 +131,6 @@ sub is_unified_hunk_start {
 }
 
 # Check if line is a top-level declaration.
-# TODO: ignore preprocessor directives except maybe #define ?
 sub is_top_level {
 	my ($function, $is_context_diff) = (@_);
 	if (is_unified_hunk_start ($function)
@@ -143,7 +142,7 @@ sub is_top_level {
 	} else {
 		$function =~ s/^.//;
 	}
-	return $function && $function !~ /^[\s{]/;
+	return $function && $function !~ /^[\s{#]/;
 }
 
 # Read contents of .diff file

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Yury Gribov]

On 05/12/2015 06:23 PM, Diego Novillo wrote:
> The patch looks fine to me.
>
> I'm not really involved in GCC development anymore. I would suggest
> that this script should be maintained by whoever's been hacking on it
> the most. It's a simple script, so it shouldn't be hard to find a new
> maintainer for it.

Trevor, Tom,

Does anyone want to volunteer?

-Y

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Tom de Vries]

On 12-05-15 17:33, Yury Gribov wrote:
> On 05/12/2015 06:23 PM, Diego Novillo wrote:
>> The patch looks fine to me.
>>
>> I'm not really involved in GCC development anymore. I would suggest
>> that this script should be maintained by whoever's been hacking on it
>> the most. It's a simple script, so it shouldn't be hard to find a new
>> maintainer for it.
>
> Trevor, Tom,
>
> Does anyone want to volunteer?
>

I'm not a good choice to be the maintainer of a perl script. I have very limited 
knowledge of it, and look at perl code maybe once per year. So I'm 
unvolunteering myself.

Thanks,
- Tom

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Trevor Saunders]

On Tue, May 12, 2015 at 06:33:28PM +0300, Yury Gribov wrote:
> On 05/12/2015 06:23 PM, Diego Novillo wrote:
> >The patch looks fine to me.
> >
> >I'm not really involved in GCC development anymore. I would suggest
> >that this script should be maintained by whoever's been hacking on it
> >the most. It's a simple script, so it shouldn't be hard to find a new
> >maintainer for it.
> 
> Trevor, Tom,
> 
> Does anyone want to volunteer?

I think you'd be the best choice :)

 I read about as much perl as Tom, but given you've tested it and it
 seems sane I'll say ok if you want me to.

thanks!

 Trev

> 
> -Y

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Diego Novillo]

On Tue, May 12, 2015 at 11:50 AM, Tom de Vries <Tom_deVries@mentor.com> wrote:

> I'm not a good choice to be the maintainer of a perl script.

I'm all kinds of sorry about the original choice of scripting
language. I'd just spend a couple of hours re-writing it in python.

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Yury Gribov]

On 05/12/2015 06:57 PM, Trevor Saunders wrote:
> On Tue, May 12, 2015 at 06:33:28PM +0300, Yury Gribov wrote:
>> On 05/12/2015 06:23 PM, Diego Novillo wrote:
>>> The patch looks fine to me.
>>>
>>> I'm not really involved in GCC development anymore. I would suggest
>>> that this script should be maintained by whoever's been hacking on it
>>> the most. It's a simple script, so it shouldn't be hard to find a new
>>> maintainer for it.
>>
>> Trevor, Tom,
>>
>> Does anyone want to volunteer?
>
> I think you'd be the best choice :)
>
>   I read about as much perl as Tom, but given you've tested it and it
>   seems sane I'll say ok if you want me to.

Hm, looks like I'm the only one who perls here.  What should I do to 
become a maintainer?

-Y

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Jeff Law]

On 05/12/2015 10:14 AM, Yury Gribov wrote:
> On 05/12/2015 06:57 PM, Trevor Saunders wrote:
>> On Tue, May 12, 2015 at 06:33:28PM +0300, Yury Gribov wrote:
>>> On 05/12/2015 06:23 PM, Diego Novillo wrote:
>>>> The patch looks fine to me.
>>>>
>>>> I'm not really involved in GCC development anymore. I would suggest
>>>> that this script should be maintained by whoever's been hacking on it
>>>> the most. It's a simple script, so it shouldn't be hard to find a new
>>>> maintainer for it.
>>>
>>> Trevor, Tom,
>>>
>>> Does anyone want to volunteer?
>>
>> I think you'd be the best choice :)
>>
>>   I read about as much perl as Tom, but given you've tested it and it
>>   seems sane I'll say ok if you want me to.
>
> Hm, looks like I'm the only one who perls here.  What should I do to
> become a maintainer?
I think we have our volunteer :-)

Jeff

Re: [PATCH][PING^2] Skip preprocessor directives in mklog

[Jeff Law]

On 05/12/2015 09:19 AM, Yury Gribov wrote:
> On 04/30/2015 12:03 PM, Yury Gribov wrote:
>> On 04/21/2015 02:26 PM, Yury Gribov wrote:
>>> Hi all,
>>>
>>> Contrib/mklog is currently faked by preprocessor directives inside
>>> functions to produce invalid ChangeLog.  The attached patch fixes this.
>>>
>>> Tested with my local mklog testsuite and http://paste.debian.net/167999/
>>> .  Ok to commit?
>
> Ping.
>
>
> mklog-1.diff
>
>
> commit 23a738d05393676e72db82cb527d5fb1b3060e2f
> Author: Yury Gribov<y.gribov@samsung.com>
> Date:   Tue Apr 21 14:17:23 2015 +0300
>
>      2015-04-21  Yury Gribov<y.gribov@samsung.com>
>
>      	* mklog: Ignore preprocessor directives.
Going to trust you on this one since I don't think anyone else does much 
with perl.

jeff