diff mbox series

[V4] rs6000: Remove unnecessary option manipulation.

Message ID 20211112161258.9964-1-mliska@suse.cz
State New
Headers show
Series [V4] rs6000: Remove unnecessary option manipulation. | expand

Commit Message

Martin Liška Nov. 12, 2021, 4:12 p.m. UTC 
Do not set flag_rename_registers, it's already enabled with EnabledBy(funroll-loops)
in the common.opt file. Use EnabledBy for unroll_only_small_loops which
is a canonical approach how can be make option dependencies.

gcc/ChangeLog:

	* config/rs6000/rs6000.c (rs6000_override_options_after_change):
	Do not set flag_rename_registers and unroll_only_small_loops.
	* config/rs6000/rs6000.opt: Use EnabledBy for unroll_only_small_loops.
---
 gcc/config/rs6000/rs6000.c   | 7 +------
 gcc/config/rs6000/rs6000.opt | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Martin Liška Nov. 18, 2021, 12:45 p.m. UTC | #1 
@Segher: PING

On 11/12/21 17:12, Martin Liska wrote:
> Do not set flag_rename_registers, it's already enabled with EnabledBy(funroll-loops)
> in the common.opt file. Use EnabledBy for unroll_only_small_loops which
> is a canonical approach how can be make option dependencies.
> 
> gcc/ChangeLog:
> 
> 	* config/rs6000/rs6000.c (rs6000_override_options_after_change):
> 	Do not set flag_rename_registers and unroll_only_small_loops.
> 	* config/rs6000/rs6000.opt: Use EnabledBy for unroll_only_small_loops.
> ---
>   gcc/config/rs6000/rs6000.c   | 7 +------
>   gcc/config/rs6000/rs6000.opt | 2 +-
>   2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
> index e4843eb0f1c..5550113a94c 100644
> --- a/gcc/config/rs6000/rs6000.c
> +++ b/gcc/config/rs6000/rs6000.c
> @@ -3466,13 +3466,8 @@ rs6000_override_options_after_change (void)
>     /* Explicit -funroll-loops turns -munroll-only-small-loops off, and
>        turns -frename-registers on.  */
>     if ((OPTION_SET_P (flag_unroll_loops) && flag_unroll_loops)
> -       || (OPTION_SET_P (flag_unroll_all_loops)
> -	   && flag_unroll_all_loops))
> +       || (OPTION_SET_P (flag_unroll_all_loops) && flag_unroll_all_loops))
>       {
> -      if (!OPTION_SET_P (unroll_only_small_loops))
> -	unroll_only_small_loops = 0;
> -      if (!OPTION_SET_P (flag_rename_registers))
> -	flag_rename_registers = 1;
>         if (!OPTION_SET_P (flag_cunroll_grow_size))
>   	flag_cunroll_grow_size = 1;
>       }
> diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
> index 9d7878f144a..faeb7423ca7 100644
> --- a/gcc/config/rs6000/rs6000.opt
> +++ b/gcc/config/rs6000/rs6000.opt
> @@ -546,7 +546,7 @@ Target Undocumented Var(rs6000_optimize_swaps) Init(1) Save
>   Analyze and remove doubleword swaps from VSX computations.
>   
>   munroll-only-small-loops
> -Target Undocumented Var(unroll_only_small_loops) Init(0) Save
> +Target Undocumented Var(unroll_only_small_loops) Init(0) Save EnabledBy(funroll-loops)
>   ; Use conservative small loop unrolling.
>   
>   mpower9-misc
>
Segher Boessenkool Nov. 18, 2021, 6:59 p.m. UTC | #2 
Hi!

On Thu, Nov 18, 2021 at 01:45:30PM +0100, Martin Liška wrote:
> @Segher: PING

This is the first time I recieved this.

Please resend, without line wrapping (format=flawed).


Segher
Martin Liška Nov. 19, 2021, 11:32 a.m. UTC | #3 
On 11/18/21 19:59, Segher Boessenkool wrote:
> Please resend, without line wrapping (format=flawed).

Done in the original [v4] email, see here:
https://gcc.gnu.org/pipermail/gcc-patches/2021-November/584267.html

Martin
Segher Boessenkool Nov. 19, 2021, 11:43 a.m. UTC | #4 
On Fri, Nov 19, 2021 at 12:32:09PM +0100, Martin Liška wrote:
> On 11/18/21 19:59, Segher Boessenkool wrote:
> >Please resend, without line wrapping (format=flawed).
> 
> Done in the original [v4] email, see here:
> https://gcc.gnu.org/pipermail/gcc-patches/2021-November/584267.html

Which you didn't send to me.  And the archives we have now don't let me
grab the raw mail from there anymore.  Please send this to me if you
want it reviewed.


Segher
Martin Liška Nov. 19, 2021, 12:25 p.m. UTC | #5 
On 11/19/21 12:43, Segher Boessenkool wrote:
> On Fri, Nov 19, 2021 at 12:32:09PM +0100, Martin Liška wrote:
>> On 11/18/21 19:59, Segher Boessenkool wrote:
>>> Please resend, without line wrapping (format=flawed).
>>
>> Done in the original [v4] email, see here:
>> https://gcc.gnu.org/pipermail/gcc-patches/2021-November/584267.html
> 
> Which you didn't send to me.  And the archives we have now don't let me
> grab the raw mail from there anymore.  Please send this to me if you
> want it reviewed.

Fine. I've just done that.

Martin

> 
> 
> Segher
>
Martin Liška Nov. 19, 2021, 12:31 p.m. UTC | #6 
On 11/19/21 13:25, Martin Liška wrote:
> Fine. I've just done that.

All right, so I can't send an email from my local machine and git imap-send
does not work as it goes through Thunderbird.

So my last attempt is attaching the email so that you can add the .eml file.

Martin
Do not set flag_rename_registers, it's already enabled with EnabledBy(funroll-loops)
in the common.opt file. Use EnabledBy for unroll_only_small_loops which
is a canonical approach how can be make option dependencies.

gcc/ChangeLog:

	* config/rs6000/rs6000.c (rs6000_override_options_after_change):
	Do not set flag_rename_registers and unroll_only_small_loops.
	* config/rs6000/rs6000.opt: Use EnabledBy for unroll_only_small_loops.
---
 gcc/config/rs6000/rs6000.c   | 7 +------
 gcc/config/rs6000/rs6000.opt | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index e4843eb0f1c..5550113a94c 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3466,13 +3466,8 @@ rs6000_override_options_after_change (void)
   /* Explicit -funroll-loops turns -munroll-only-small-loops off, and
      turns -frename-registers on.  */
   if ((OPTION_SET_P (flag_unroll_loops) && flag_unroll_loops)
-       || (OPTION_SET_P (flag_unroll_all_loops)
-	   && flag_unroll_all_loops))
+       || (OPTION_SET_P (flag_unroll_all_loops) && flag_unroll_all_loops))
     {
-      if (!OPTION_SET_P (unroll_only_small_loops))
-	unroll_only_small_loops = 0;
-      if (!OPTION_SET_P (flag_rename_registers))
-	flag_rename_registers = 1;
       if (!OPTION_SET_P (flag_cunroll_grow_size))
 	flag_cunroll_grow_size = 1;
     }
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 9d7878f144a..faeb7423ca7 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -546,7 +546,7 @@ Target Undocumented Var(rs6000_optimize_swaps) Init(1) Save
 Analyze and remove doubleword swaps from VSX computations.
 
 munroll-only-small-loops
-Target Undocumented Var(unroll_only_small_loops) Init(0) Save
+Target Undocumented Var(unroll_only_small_loops) Init(0) Save EnabledBy(funroll-loops)
 ; Use conservative small loop unrolling.
 
 mpower9-misc
Segher Boessenkool Nov. 19, 2021, 12:45 p.m. UTC | #7 
On Fri, Nov 19, 2021 at 01:31:21PM +0100, Martin Liška wrote:
> All right, so I can't send an email from my local machine and git imap-send
> does not work as it goes through Thunderbird.

Hrm, painful (for you).  You should figure out how you can do the basics
of the patch-based workflow that we all have to do.

> So my last attempt is attaching the email so that you can add the .eml file.

I cannot do that, but it is text, so it is inlined fine.  Thanks.

This is almost identical to what git format-patch would give you, btw.

> Subject: [PATCH][V4] rs6000: Remove unnecessary option manipulation.

> Do not set flag_rename_registers, it's already enabled with EnabledBy(funroll-loops)
> in the common.opt file. Use EnabledBy for unroll_only_small_loops which
> is a canonical approach how can be make option dependencies.
> 
> gcc/ChangeLog:
> 
> 	* config/rs6000/rs6000.c (rs6000_override_options_after_change):
> 	Do not set flag_rename_registers and unroll_only_small_loops.

Please don't end changelog lines in ":", it looks like something is
missing.  Changelog lines wrap at 80 cols.

> 	* config/rs6000/rs6000.opt: Use EnabledBy for unroll_only_small_loops.

> --- a/gcc/config/rs6000/rs6000.c
> +++ b/gcc/config/rs6000/rs6000.c
> @@ -3466,13 +3466,8 @@ rs6000_override_options_after_change (void)
>    /* Explicit -funroll-loops turns -munroll-only-small-loops off, and
>       turns -frename-registers on.  */
>    if ((OPTION_SET_P (flag_unroll_loops) && flag_unroll_loops)
> -       || (OPTION_SET_P (flag_unroll_all_loops)
> -	   && flag_unroll_all_loops))
> +       || (OPTION_SET_P (flag_unroll_all_loops) && flag_unroll_all_loops))

You should mention this change in the changelog as well.

> -      if (!OPTION_SET_P (unroll_only_small_loops))
> -	unroll_only_small_loops = 0;
> -      if (!OPTION_SET_P (flag_rename_registers))
> -	flag_rename_registers = 1;
>        if (!OPTION_SET_P (flag_cunroll_grow_size))
>  	flag_cunroll_grow_size = 1;
>      }
> diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
> index 9d7878f144a..faeb7423ca7 100644
> --- a/gcc/config/rs6000/rs6000.opt
> +++ b/gcc/config/rs6000/rs6000.opt
> @@ -546,7 +546,7 @@ Target Undocumented Var(rs6000_optimize_swaps) Init(1) Save
>  Analyze and remove doubleword swaps from VSX computations.
>  
>  munroll-only-small-loops
> -Target Undocumented Var(unroll_only_small_loops) Init(0) Save
> +Target Undocumented Var(unroll_only_small_loops) Init(0) Save EnabledBy(funroll-loops)
>  ; Use conservative small loop unrolling.

That is the opposite of the original logic.


Segher
Martin Liška Nov. 19, 2021, 12:57 p.m. UTC | #8 
On 11/19/21 13:45, Segher Boessenkool wrote:
> On Fri, Nov 19, 2021 at 01:31:21PM +0100, Martin Liška wrote:
>> All right, so I can't send an email from my local machine and git imap-send
>> does not work as it goes through Thunderbird.
> 
> Hrm, painful (for you).  You should figure out how you can do the basics
> of the patch-based workflow that we all have to do.

Sure, but to be honest others don't have problem with patches attached to an email
(with whatever mime type an email client uses).

> 
>> So my last attempt is attaching the email so that you can add the .eml file.
> 
> I cannot do that, but it is text, so it is inlined fine.  Thanks.
> 
> This is almost identical to what git format-patch would give you, btw.

Sure, apparently Redirect plugin in TW should work and preserve the email as you need.

> 
>> Subject: [PATCH][V4] rs6000: Remove unnecessary option manipulation.
> 
>> Do not set flag_rename_registers, it's already enabled with EnabledBy(funroll-loops)
>> in the common.opt file. Use EnabledBy for unroll_only_small_loops which
>> is a canonical approach how can be make option dependencies.
>>
>> gcc/ChangeLog:
>>
>> 	* config/rs6000/rs6000.c (rs6000_override_options_after_change):
>> 	Do not set flag_rename_registers and unroll_only_small_loops.
> 
> Please don't end changelog lines in ":", it looks like something is
> missing.  Changelog lines wrap at 80 cols.
> 
>> 	* config/rs6000/rs6000.opt: Use EnabledBy for unroll_only_small_loops.
> 
>> --- a/gcc/config/rs6000/rs6000.c
>> +++ b/gcc/config/rs6000/rs6000.c
>> @@ -3466,13 +3466,8 @@ rs6000_override_options_after_change (void)
>>     /* Explicit -funroll-loops turns -munroll-only-small-loops off, and
>>        turns -frename-registers on.  */
>>     if ((OPTION_SET_P (flag_unroll_loops) && flag_unroll_loops)
>> -       || (OPTION_SET_P (flag_unroll_all_loops)
>> -	   && flag_unroll_all_loops))
>> +       || (OPTION_SET_P (flag_unroll_all_loops) && flag_unroll_all_loops))
> 
> You should mention this change in the changelog as well.
> 
>> -      if (!OPTION_SET_P (unroll_only_small_loops))
>> -	unroll_only_small_loops = 0;
>> -      if (!OPTION_SET_P (flag_rename_registers))
>> -	flag_rename_registers = 1;
>>         if (!OPTION_SET_P (flag_cunroll_grow_size))
>>   	flag_cunroll_grow_size = 1;
>>       }
>> diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
>> index 9d7878f144a..faeb7423ca7 100644
>> --- a/gcc/config/rs6000/rs6000.opt
>> +++ b/gcc/config/rs6000/rs6000.opt
>> @@ -546,7 +546,7 @@ Target Undocumented Var(rs6000_optimize_swaps) Init(1) Save
>>   Analyze and remove doubleword swaps from VSX computations.
>>   
>>   munroll-only-small-loops
>> -Target Undocumented Var(unroll_only_small_loops) Init(0) Save
>> +Target Undocumented Var(unroll_only_small_loops) Init(0) Save EnabledBy(funroll-loops)
>>   ; Use conservative small loop unrolling.
> 
> That is the opposite of the original logic.

You are correct! Forget about the patch, I don't want it merged any longer.

Martin

> 
> 
> Segher
>
diff mbox series

Patch

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index e4843eb0f1c..5550113a94c 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3466,13 +3466,8 @@  rs6000_override_options_after_change (void)
   /* Explicit -funroll-loops turns -munroll-only-small-loops off, and
      turns -frename-registers on.  */
   if ((OPTION_SET_P (flag_unroll_loops) && flag_unroll_loops)
-       || (OPTION_SET_P (flag_unroll_all_loops)
-	   && flag_unroll_all_loops))
+       || (OPTION_SET_P (flag_unroll_all_loops) && flag_unroll_all_loops))
     {
-      if (!OPTION_SET_P (unroll_only_small_loops))
-	unroll_only_small_loops = 0;
-      if (!OPTION_SET_P (flag_rename_registers))
-	flag_rename_registers = 1;
       if (!OPTION_SET_P (flag_cunroll_grow_size))
 	flag_cunroll_grow_size = 1;
     }
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 9d7878f144a..faeb7423ca7 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -546,7 +546,7 @@  Target Undocumented Var(rs6000_optimize_swaps) Init(1) Save
 Analyze and remove doubleword swaps from VSX computations.
 
 munroll-only-small-loops
-Target Undocumented Var(unroll_only_small_loops) Init(0) Save
+Target Undocumented Var(unroll_only_small_loops) Init(0) Save EnabledBy(funroll-loops)
 ; Use conservative small loop unrolling.
 
 mpower9-misc