[gcc(refs/users/marxin/heads/PR102688-fix-frename-registers-handling-part-2)] rs6000: Remove unnecessary option manipulation.

[gcc(refs/users/marxin/heads/PR102688-fix-frename-registers-handling-part-2)] rs6000: Remove unnecessary option manipulation.

[Martin Liska]

https://gcc.gnu.org/g:cd9891ec3eed3a5b289b7c556598606d21e48206

commit cd9891ec3eed3a5b289b7c556598606d21e48206
Author: Martin Liska <mliska@suse.cz>
Date:   Wed Oct 13 14:20:33 2021 +0200

    rs6000: Remove unnecessary option manipulation.
    
    gcc/ChangeLog:
    
            * config/rs6000/rs6000.c (rs6000_override_options_after_change):
            Do not set flag_rename_registers, it's already default behavior.
            Use EnabledBy for unroll_only_small_loops.
            * config/rs6000/rs6000.opt: Use EnabledBy for
            unroll_only_small_loops.

Diff:
---
 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 01a95591a5d..b9dddcd0aa1 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3472,13 +3472,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

[gcc(refs/users/marxin/heads/PR102688-fix-frename-registers-handling-part-2)] rs6000: Remove unnecessary option manipulation.

[Martin Liska]

https://gcc.gnu.org/g:4db8cfa3ef42af798c89b072f384a75ce7da5585

commit 4db8cfa3ef42af798c89b072f384a75ce7da5585
Author: Martin Liska <mliska@suse.cz>
Date:   Wed Oct 13 14:20:33 2021 +0200

    rs6000: Remove unnecessary option manipulation.
    
    gcc/ChangeLog:
    
            * config/rs6000/rs6000.c (rs6000_override_options_after_change):
            Do not set flag_rename_registers, it's already default behavior.
            Use EnabledBy for unroll_only_small_loops.
            * config/rs6000/rs6000.opt: Use EnabledBy for
            unroll_only_small_loops.

Diff:
---
 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 acba4d9f26c..40146179e06 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3472,13 +3472,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